From: Rafał Miłecki <rafal@milecki.pl>
Date: Wed, 20 Jul 2022 11:47:06 +0000 (+0200)
Subject: uboot-bcm4908: include SoC in output files
X-Git-Tag: v22.03.0-rc6~14
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e0d3dc5de195d70f740178fe49b0928ca39ae58f;p=openwrt%2Fopenwrt.git

uboot-bcm4908: include SoC in output files

This fixes problem of overwriting BCM4908 U-Boot and DTB files by
BCM4912 ones. That bug didn't allow booting BCM4908 devices.

Fixes: f4c2dab544ec2 ("uboot-bcm4908: add BCM4912 build")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit a8e1e30543239e85ff5dc220368164b66cf73fba)
---

diff --git a/package/boot/uboot-bcm4908/Makefile b/package/boot/uboot-bcm4908/Makefile
index d6b689c9ce..7eacd23a02 100644
--- a/package/boot/uboot-bcm4908/Makefile
+++ b/package/boot/uboot-bcm4908/Makefile
@@ -23,11 +23,13 @@ endef
 define U-Boot/bcm4908
   NAME:=Broadcom's BCM4908
   UBOOT_CONFIG:=bcm94908
+  SOC:=bcm4908
 endef
 
 define U-Boot/bcm4912
   NAME:=Broadcom's BCM4912
   UBOOT_CONFIG:=bcm94912
+  SOC:=bcm4912
 endef
 
 UBOOT_TARGETS := \
@@ -46,8 +48,8 @@ endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/u-boot
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/u-boot/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/u-boot.dtb $(STAGING_DIR_IMAGE)/u-boot/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/u-boot/u-boot-$(SOC).bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/u-boot.dtb $(STAGING_DIR_IMAGE)/u-boot/u-boot-$(SOC).dtb
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/arch/arm/dts/*.dtb $(STAGING_DIR_IMAGE)/u-boot/
 endef
 
diff --git a/target/linux/bcm4908/image/bootfs-bcm4908.its b/target/linux/bcm4908/image/bootfs-bcm4908.its
index b80cbd529e..d5ac21fd6a 100644
--- a/target/linux/bcm4908/image/bootfs-bcm4908.its
+++ b/target/linux/bcm4908/image/bootfs-bcm4908.its
@@ -5,11 +5,11 @@
 / {
 	images {
 		uboot {
-			data = /incbin/("${images_dir}/u-boot/u-boot-nodtb.bin");
+			data = /incbin/("${images_dir}/u-boot/u-boot-bcm4908.bin");
 		};
 
 		fdt_uboot {
-			data = /incbin/("${images_dir}/u-boot/u-boot.dtb");
+			data = /incbin/("${images_dir}/u-boot/u-boot-bcm4908.dtb");
 		};
 
 		fdt_uboot_RAX220 {
diff --git a/target/linux/bcm4908/image/bootfs-bcm4912.its b/target/linux/bcm4908/image/bootfs-bcm4912.its
index 7c91144a18..6f4548956c 100644
--- a/target/linux/bcm4908/image/bootfs-bcm4912.its
+++ b/target/linux/bcm4908/image/bootfs-bcm4912.its
@@ -5,11 +5,11 @@
 / {
 	images {
 		uboot {
-			data = /incbin/("${images_dir}/u-boot/u-boot-nodtb.bin");
+			data = /incbin/("${images_dir}/u-boot/u-boot-bcm4912.bin");
 		};
 
 		fdt_uboot {
-			data = /incbin/("${images_dir}/u-boot/u-boot.dtb");
+			data = /incbin/("${images_dir}/u-boot/u-boot-bcm4912.dtb");
 		};
 
 		fdt_GTAX6000 {