From 72e7d9cf4933e213d4cda5ab1c8a28a88a6a4299 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 6 Mar 2021 19:04:15 +0000 Subject: [PATCH] ipq806x: work-around borked QCA SDK bootloader The bootloader of many ipq806x boards seems to require the config node of the FIT image to be 'config@1' (or a secific different value). This requirement used to be implicitely satisfied because OpenWrt used to also call the configuration node inside a FIT image 'config@1'. However, as recent U-Boot now prohibits the use of the '@' symbol as part of node names, this was changed by commit 5ec60cbe9d ("scripts: mkits.sh: replace @ with - in nodes") Explicitely restore the default name of the configuration node to 'config@1' on ipq806x. (ipq807x is unaffected as DEVICE_DTS_CONFIG default is set "config@hk01" in target/linux/ipq807x/image/Makefile) Reported-by: Chen Minqiang Signed-off-by: Daniel Golle --- target/linux/ipq806x/image/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index b725459c66..9d7ee22ee7 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -16,6 +16,7 @@ define Device/Default KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_LOADADDR = 0x42208000 + DEVICE_DTS_CONFIG := config@1 IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin/squashfs := endef