diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2022-03-15 18:41:03 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2022-03-15 18:43:41 +0100 |
| commit | f4c2dab544ec22fac6ab2de32aa5bb361c7566f7 (patch) | |
| tree | 43225553ff4c7e0a097eb83be25fece753672797 /package/boot | |
| parent | 3592aa85664040a118654555afb78659af756a4e (diff) | |
| download | upstream-f4c2dab544ec22fac6ab2de32aa5bb361c7566f7.tar.gz upstream-f4c2dab544ec22fac6ab2de32aa5bb361c7566f7.tar.bz2 upstream-f4c2dab544ec22fac6ab2de32aa5bb361c7566f7.zip | |
uboot-bcm4908: add BCM4912 build
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/boot')
3 files changed, 33 insertions, 3 deletions
diff --git a/package/boot/uboot-bcm4908/Makefile b/package/boot/uboot-bcm4908/Makefile index b226096184..d6b689c9ce 100644 --- a/package/boot/uboot-bcm4908/Makefile +++ b/package/boot/uboot-bcm4908/Makefile @@ -25,8 +25,14 @@ define U-Boot/bcm4908 UBOOT_CONFIG:=bcm94908 endef +define U-Boot/bcm4912 + NAME:=Broadcom's BCM4912 + UBOOT_CONFIG:=bcm94912 +endef + UBOOT_TARGETS := \ - bcm4908 + bcm4908 \ + bcm4912 define Build/Prepare $(call Build/Prepare/Default) diff --git a/package/boot/uboot-bcm4908/patches/200-configs-bcm94908-unset-CONFIG_SPL.patch b/package/boot/uboot-bcm4908/patches/200-configs-bcm94908-unset-CONFIG_SPL.patch index 26189bc571..0b434f356a 100644 --- a/package/boot/uboot-bcm4908/patches/200-configs-bcm94908-unset-CONFIG_SPL.patch +++ b/package/boot/uboot-bcm4908/patches/200-configs-bcm94908-unset-CONFIG_SPL.patch @@ -23,7 +23,8 @@ shipped with every firmware. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- configs/bcm94908_defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configs/bcm94912_defconfig | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) --- a/configs/bcm94908_defconfig +++ b/configs/bcm94908_defconfig @@ -36,3 +37,14 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_TPL_SYS_MALLOC_F_LEN=0x11000 +--- a/configs/bcm94912_defconfig ++++ b/configs/bcm94912_defconfig +@@ -22,7 +22,7 @@ CONFIG_TPL_LIBCOMMON_SUPPORT=y + CONFIG_TPL_LIBGENERIC_SUPPORT=y + CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 + CONFIG_NR_DRAM_BANKS=2 +-CONFIG_SPL=y ++# CONFIG_SPL is not set + CONFIG_SPL_LIBDISK_SUPPORT=y + CONFIG_ENV_VARS_UBOOT_CONFIG=y + CONFIG_TPL_SYS_MALLOC_F_LEN=0x10000 diff --git a/package/boot/uboot-bcm4908/patches/201-Assume-TPL-support-for-ATF-when-compiling-U-Boot-wit.patch b/package/boot/uboot-bcm4908/patches/201-Assume-TPL-support-for-ATF-when-compiling-U-Boot-wit.patch index 1e59705ac0..187ee96b18 100644 --- a/package/boot/uboot-bcm4908/patches/201-Assume-TPL-support-for-ATF-when-compiling-U-Boot-wit.patch +++ b/package/boot/uboot-bcm4908/patches/201-Assume-TPL-support-for-ATF-when-compiling-U-Boot-wit.patch @@ -19,8 +19,9 @@ deal with compiling SPL or TPL. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- arch/arm/mach-bcmbca/bcm4908/cpu.c | 2 +- + arch/arm/mach-bcmbca/bcm4912/cpu.c | 2 +- board/broadcom/bcmbca/board.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 3 files changed, 4 insertions(+), 4 deletions(-) --- a/arch/arm/mach-bcmbca/bcm4908/cpu.c +++ b/arch/arm/mach-bcmbca/bcm4908/cpu.c @@ -33,6 +34,17 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> void boot_secondary_cpu(unsigned long vector) { uint32_t cpu, nr_cpus = QUAD_CPUS; +--- a/arch/arm/mach-bcmbca/bcm4912/cpu.c ++++ b/arch/arm/mach-bcmbca/bcm4912/cpu.c +@@ -174,7 +174,7 @@ int bcmbca_get_boot_device(void) + return BOOT_DEVICE_NONE; + } + +-#if !defined(CONFIG_TPL_ATF) ++#if defined(CONFIG_TPL) && !defined(CONFIG_TPL_ATF) + void boot_secondary_cpu(unsigned long vector) + { + uint32_t cpu, nr_cpus = 4; --- a/board/broadcom/bcmbca/board.c +++ b/board/broadcom/bcmbca/board.c @@ -103,7 +103,7 @@ void board_spinor_init(void) |