Skip to contentSkip to conversation

linux: add support for vendor dirs for appended DTBs

PATCH Applied Alexander Sverdlin 2 participants 2 messages Jul 6, 2023 – Jul 11, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux: add support for vendor dirs for appended DTBs

Take the basename of the appended DTBs to workaround the following problem:

(cd .../arch/arm/boot; for dtb in cirrus/ep93xx-edb9302
do if test -e ${dtb}.dtb ; then dtbpath=${dtb}.dtb
else dtbpath=dts/${dtb}.dtb ; fi
cat zImage ${dtbpath} > zImage.${dtb} || exit 1; done)
/bin/sh: line 1: zImage.cirrus/ep93xx-edb9302: No such file or directory

Necessary to support ARM Linux starting from commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories"), i.e. Linux v6.4+.

---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
linux/linux.mk +1 -1
index 1c4fe45ac9..1db5c6046d 100644
@@ -468,7 +468,7 @@ define LINUX_APPEND_DTB
 			else \
 				dtbpath=dts/$${dtb}.dtb ; \
 			fi ; \
-			cat zImage $${dtbpath} > zImage.$${dtb} || exit 1; \
+			cat zImage $${dtbpath} > zImage.$$(basename $${dtb}) || exit 1; \
 		done)
 endef
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
Signature · 6 lines
2.41.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 8 lines · On Fri, 7 Jul 2023 00:26:07 +0200 Alexander Sverdlin…

Take the basename of the appended DTBs to workaround the following problem:

(cd .../arch/arm/boot; for dtb in cirrus/ep93xx-edb9302
do if test -e ${dtb}.dtb ; then dtbpath=${dtb}.dtb
else dtbpath=dts/${dtb}.dtb ; fi
cat zImage ${dtbpath} > zImage.${dtb} || exit 1; done)
/bin/sh: line 1: zImage.cirrus/ep93xx-edb9302: No such file or directory

Quoted 7 lines

Necessary to support ARM Linux starting from commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories"), i.e. Linux v6.4+.

---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot