scripts: mkits.sh make it possible to specify fdt@#

Some bootloaders are really keen on just one special
fdt in a multi-image fit image. This is a problem, because
currently this is fixed to "fdt@1".

This patch introduces a new device variable:
DEVICE_FDT_NUM that allows to specify the right
fdt number.

If the value is absent "1" will be chosen.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 9516801c8dfd596e5f2c251b15c013c2a26e0642..740d627fc735cb32d9a5297fd688ab86481166db 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -158,6 +158,7 @@ define Build/fit
                -D $(DEVICE_NAME) -o $@.its -k $@ \
                $(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \
                -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
+               $(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
                -c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config@1") \
                -A $(LINUX_KARCH) -v $(LINUX_VERSION)
        PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new

diff --git a/include/image.mk b/include/image.mk
index 703aeb6816254abc1698c87e2cc72faeee6832eb..a1308f47ade46402725cb9c8feae27d6c7fac0f8 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -432,6 +432,7 @@ define Device/Init
   DEVICE_DTS :=
   DEVICE_DTS_CONFIG :=
   DEVICE_DTS_DIR :=
+  DEVICE_FDT_NUM :=
   SOC :=
 
   BOARD_NAME :=
@@ -453,8 +454,9 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE KERNEL_SIZE \
   CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \
   VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \
-  DEVICE_DTS_CONFIG DEVICE_DTS_DIR SOC BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \
-  IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR UBOOT_PATH IMAGE_SIZE \
+  DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_FDT_NUM SOC BOARD_NAME \
+  UIMAGE_NAME SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
+  UBOOT_PATH IMAGE_SIZE \
   DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
   DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
   DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index 468ef670e620dbf825fee55c578af1aa430c71d4..bb629d6fca6e130ccfa45bced372fc108ee3cf41 100755 (executable)
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -16,7 +16,7 @@
 
 usage() {
        printf "Usage: %s -A arch -C comp -a addr -e entry" "$(basename "$0")"
-       printf " -v version -k kernel [-D name -d dtb] -o its_file"
+       printf " -v version -k kernel [-D name -n address -d dtb] -o its_file"
 
        printf "\n\t-A ==> set architecture to 'arch'"
        printf "\n\t-C ==> set compression type 'comp'"
@@ -26,12 +26,15 @@ usage() {
        printf "\n\t-v ==> set kernel version to 'version'"
        printf "\n\t-k ==> include kernel image 'kernel'"
        printf "\n\t-D ==> human friendly Device Tree Blob 'name'"
+       printf "\n\t-n ==> fdt unit-address 'address'"
        printf "\n\t-d ==> include Device Tree Blob 'dtb'"
        printf "\n\t-o ==> create output file 'its_file'\n"
        exit 1
 }
 
-while getopts ":A:a:c:C:D:d:e:k:o:v:" OPTION
+FDTNUM=1
+
+while getopts ":A:a:c:C:D:d:e:k:n:o:v:" OPTION
 do
        case $OPTION in
                A ) ARCH=$OPTARG;;
@@ -42,6 +45,7 @@ do
                d ) DTB=$OPTARG;;
                e ) ENTRY_ADDR=$OPTARG;;
                k ) KERNEL=$OPTARG;;
+               n ) FDTNUM=$OPTARG;;
                o ) OUTPUT=$OPTARG;;
                v ) VERSION=$OPTARG;;
                * ) echo "Invalid option passed to '$0' (options:$*)"
@@ -61,7 +65,7 @@ ARCH_UPPER=$(echo "$ARCH" | tr '[:lower:]' '[:upper:]')
 # Conditionally create fdt information
 if [ -n "${DTB}" ]; then
        FDT_NODE="
-               fdt@1 {
+               fdt@$FDTNUM {
                        description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
                        data = /incbin/(\"${DTB}\");
                        type = \"flat_dt\";
@@ -75,7 +79,7 @@ if [ -n "${DTB}" ]; then
                        };
                };
 "
-       FDT_PROP="fdt = \"fdt@1\";"
+       FDT_PROP="fdt = \"fdt@$FDTNUM\";"
 fi
 
 # Create a default, fully populated DTS file