cantyonion/opi-openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot-bcm4908: include SoC in output files

Browse Source 
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)
This commit is contained in:
Rafał Miłecki 2022-07-20 13:47:06 +02:00
parent 066547b974
commit e0d3dc5de1
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/boot/uboot-bcm4908/Makefile
View File

@ -23,11 +23,13 @@ endef
define U-Boot/bcm4908 define U-Boot/bcm4908
NAME:=Broadcom's BCM4908 NAME:=Broadcom's BCM4908
UBOOT_CONFIG:=bcm94908 UBOOT_CONFIG:=bcm94908
SOC:=bcm4908
endef endef
define U-Boot/bcm4912 define U-Boot/bcm4912
NAME:=Broadcom's BCM4912 NAME:=Broadcom's BCM4912
UBOOT_CONFIG:=bcm94912 UBOOT_CONFIG:=bcm94912
SOC:=bcm4912
endef endef
UBOOT_TARGETS := \ UBOOT_TARGETS := \
@ -46,8 +48,8 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/u-boot $(INSTALL_DIR) $(STAGING_DIR_IMAGE)/u-boot
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(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/ $(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/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/arch/arm/dts/*.dtb $(STAGING_DIR_IMAGE)/u-boot/
endef endef

4
target/linux/bcm4908/image/bootfs-bcm4908.its
View File

@ -5,11 +5,11 @@
/ { / {
images { images {
uboot { uboot {
data = /incbin/("${images_dir}/u-boot/u-boot-nodtb.bin"); data = /incbin/("${images_dir}/u-boot/u-boot-bcm4908.bin");
}; };
fdt_uboot { fdt_uboot {
data = /incbin/("${images_dir}/u-boot/u-boot.dtb"); data = /incbin/("${images_dir}/u-boot/u-boot-bcm4908.dtb");
}; };
fdt_uboot_RAX220 { fdt_uboot_RAX220 {

4
target/linux/bcm4908/image/bootfs-bcm4912.its
View File

@ -5,11 +5,11 @@
/ { / {
images { images {
uboot { uboot {
data = /incbin/("${images_dir}/u-boot/u-boot-nodtb.bin"); data = /incbin/("${images_dir}/u-boot/u-boot-bcm4912.bin");
}; };
fdt_uboot { fdt_uboot {
data = /incbin/("${images_dir}/u-boot/u-boot.dtb"); data = /incbin/("${images_dir}/u-boot/u-boot-bcm4912.dtb");
}; };
fdt_GTAX6000 { fdt_GTAX6000 {