[openwrt/openwrt] rockchip: allow for multiple boot-scripts

LEDE Commits lede-commits at lists.infradead.org
Tue Jul 28 10:02:13 EDT 2020


blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b72f7c64a4eb4aa14f3b632dd4ff77a4802c0311

commit b72f7c64a4eb4aa14f3b632dd4ff77a4802c0311
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Sat Jul 11 14:02:23 2020 +0200

    rockchip: allow for multiple boot-scripts
    
    Add support for select a bootscript depending on the device built. This
    is necessary, as the FriendlyARM NanoPi R2S needs a different bootcmd in
    order to produce output on the debug UART.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 target/linux/rockchip/image/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index 22854d9d02..3c17e963be 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -24,7 +24,7 @@ endef
 
 define Build/boot-script
 	# Make an U-boot image and copy it to the boot partition
-	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d mmc.bootscript $@.boot/boot.scr
+	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d $(if $(1),$(1),mmc).bootscript $@.boot/boot.scr
 endef
 
 define Build/pine64-img



More information about the lede-commits mailing list