@@ -108,7 +108,7 @@ create_rk_image () {
mcopy -i ${WORKDIR}/${BOOT_IMG} -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::${KERNEL_IMAGETYPE}
DEVICETREE_DEFAULT=""
- for DTS_FILE in ${KERNEL_DEVICETREE}; do
+ for DTS_FILE in $(echo ${KERNEL_DEVICETREE} | cut -d'/' -f2); do
[ -n "${DEVICETREE_DEFAULT}"] && DEVICETREE_DEFAULT="${DTS_FILE}"
mcopy -i ${WORKDIR}/${BOOT_IMG} -s ${DEPLOY_DIR_IMAGE}/${DTS_FILE} ::${DTS_FILE}
done
@@ -9,5 +9,5 @@
require conf/machine/include/rk3288.inc
require conf/machine/include/rockchip-wic.inc
-KERNEL_DEVICETREE = "rk3288-firefly.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-firefly.dtb"
UBOOT_MACHINE = "firefly-rk3288_defconfig"
@@ -11,9 +11,13 @@ WKS_FILE_DEPENDS ?= " \
virtual/bootloader \
virtual/kernel \
"
+# KERNEL_DEVICETREE follows the pattern of 'rockchip/${SOC_FAMILY}-${BOARD}.dtb'
+# but is placed in the deploy directory as simply '${SOC_FAMILY}-${BOARD}.dtb'
+# therefore we have to strip off the 'rockchip/' for IMAGE_BOOT_FILES
+NONFITDT="${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}"
IMAGE_BOOT_FILES = " \
${KERNEL_IMAGETYPE} \
- ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${KERNEL_DEVICETREE}', d)} \
+ ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${NONFITDT}', d)} \
"
# use the first-defined <baud>;<device> pair in SERIAL_CONSOLES
@@ -8,4 +8,4 @@
require conf/machine/include/rk3066.inc
-KERNEL_DEVICETREE = "rk3066a-marsboard.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb"
@@ -9,4 +9,4 @@
require conf/machine/include/rk3188.inc
-KERNEL_DEVICETREE = "rk3188-radxarock.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb"
@@ -9,7 +9,7 @@
require conf/machine/include/rk3288.inc
SPL_BINARY = "u-boot-spl-dtb.bin"
-KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-rock2-square.dtb"
UBOOT_MACHINE = "rock2_defconfig"
# This board doesn't support the combined idbloader, so resort to the older
@@ -7,5 +7,5 @@
require conf/machine/include/tinker.inc
-KERNEL_DEVICETREE = "rk3288-tinker-s.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker-s.dtb"
UBOOT_MACHINE = "tinker-s-rk3288_defconfig"
@@ -7,5 +7,5 @@
require conf/machine/include/tinker.inc
-KERNEL_DEVICETREE = "rk3288-tinker.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker.dtb"
UBOOT_MACHINE = "tinker-rk3288_defconfig"
@@ -9,7 +9,7 @@ require conf/machine/include/rk3288.inc
require conf/machine/include/rockchip-wic.inc
KERNEL_IMAGETYPE = "uImage"
-KERNEL_DEVICETREE = "rk3288-vyasa.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-vyasa.dtb"
KERNEL_EXTRA_ARGS += "LOADADDR=0x02000000"
UBOOT_MACHINE = "vyasa-rk3288_defconfig"