uboot-bcm4908: add BCM4912 build
authorRafał Miłecki <rafal@milecki.pl>
Tue, 15 Mar 2022 17:41:03 +0000 (18:41 +0100)
committerRafał Miłecki <rafal@milecki.pl>
Thu, 1 Sep 2022 15:38:28 +0000 (17:38 +0200)
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit f4c2dab544ec22fac6ab2de32aa5bb361c7566f7)

package/boot/uboot-bcm4908/Makefile
package/boot/uboot-bcm4908/patches/200-configs-bcm94908-unset-CONFIG_SPL.patch
package/boot/uboot-bcm4908/patches/201-Assume-TPL-support-for-ATF-when-compiling-U-Boot-wit.patch

index b226096184e5da045087d11bbeae29cd1479f9c6..d6b689c9ce1b11cb12f8b2933c2d581ed6c031a7 100644 (file)
@@ -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)
index 26189bc57159e2b3c920161ae596b8d8525cb9e9..0b434f356ae4d2a6338800d37bae86fe1c1382ad 100644 (file)
@@ -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
index 1e59705ac054ace92a32f02bec1bd7231d713fdf..187ee96b1847599ddd68f85efe30da8ab56fc218 100644 (file)
@@ -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)