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>
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 := \
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
/ {
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 {
/ {
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 {