diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2022-07-20 13:47:06 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2022-07-28 00:50:13 +0200 |
| commit | e0d3dc5de195d70f740178fe49b0928ca39ae58f (patch) | |
| tree | 0004c29e1d7529b08ba34e587580121c678bf45a | |
| parent | 066547b9742bb301981ec8941950399d3c7d8a6b (diff) | |
| download | upstream-e0d3dc5de195d70f740178fe49b0928ca39ae58f.tar.gz upstream-e0d3dc5de195d70f740178fe49b0928ca39ae58f.tar.bz2 upstream-e0d3dc5de195d70f740178fe49b0928ca39ae58f.zip | |
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)
| -rw-r--r-- | package/boot/uboot-bcm4908/Makefile | 6 | ||||
| -rw-r--r-- | target/linux/bcm4908/image/bootfs-bcm4908.its | 4 | ||||
| -rw-r--r-- | target/linux/bcm4908/image/bootfs-bcm4912.its | 4 |
3 files changed, 8 insertions, 6 deletions
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 { |