diff mbox

[U-Boot,v2,1/2] ARM: bcm: Enable five Cygnus boards

Message ID 1415734339-4135-1-git-send-email-srae@broadcom.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Steve Rae Nov. 11, 2014, 7:32 p.m. UTC 
bcm911360_entphn
bcm911360_entphn-ns
bcm911360k
bcm958300k-ns
bcm958305k

- updates to support Cygnus and NSP board families better
- add functions so CONFIG_ARMV7_NONSEC can be enabled on Cygnus boards

Signed-off-by: Steve Rae <srae@broadcom.com>
---

Changes in v2:
- split into two commits

 arch/arm/Kconfig                                 | 12 ++++++------
 board/broadcom/bcm911360_entphn-ns/MAINTAINERS   |  6 ++++++
 board/broadcom/bcm911360_entphn/MAINTAINERS      |  6 ++++++
 board/broadcom/bcm911360k/MAINTAINERS            |  6 ++++++
 board/broadcom/bcm958300k-ns/MAINTAINERS         |  6 ++++++
 board/broadcom/bcm958300k/MAINTAINERS            |  4 ++--
 board/broadcom/bcm958305k/MAINTAINERS            |  6 ++++++
 board/broadcom/bcm958622hr/MAINTAINERS           |  4 ++--
 board/broadcom/bcm_ep/board.c                    | 14 ++++++++++++++
 board/broadcom/{bcm958300k => bcmcygnus}/Kconfig |  2 +-
 board/broadcom/{bcm958622hr => bcmnsp}/Kconfig   |  2 +-
 configs/bcm911360_entphn-ns_defconfig            |  3 +++
 configs/bcm911360_entphn_defconfig               |  3 +++
 configs/bcm911360k_defconfig                     |  3 +++
 configs/bcm958300k-ns_defconfig                  |  3 +++
 configs/bcm958300k_defconfig                     |  4 ++--
 configs/bcm958305k_defconfig                     |  3 +++
 configs/bcm958622hr_defconfig                    |  2 +-
 18 files changed, 74 insertions(+), 15 deletions(-)
 create mode 100644 board/broadcom/bcm911360_entphn-ns/MAINTAINERS
 create mode 100644 board/broadcom/bcm911360_entphn/MAINTAINERS
 create mode 100644 board/broadcom/bcm911360k/MAINTAINERS
 create mode 100644 board/broadcom/bcm958300k-ns/MAINTAINERS
 create mode 100644 board/broadcom/bcm958305k/MAINTAINERS
 rename board/broadcom/{bcm958300k => bcmcygnus}/Kconfig (88%)
 rename board/broadcom/{bcm958622hr => bcmnsp}/Kconfig (88%)
 create mode 100644 configs/bcm911360_entphn-ns_defconfig
 create mode 100644 configs/bcm911360_entphn_defconfig
 create mode 100644 configs/bcm911360k_defconfig
 create mode 100644 configs/bcm958300k-ns_defconfig
 create mode 100644 configs/bcm958305k_defconfig

Comments

Tom Rini Nov. 24, 2014, 10:11 p.m. UTC | #1 
On Tue, Nov 11, 2014 at 11:32:18AM -0800, Steve Rae wrote:

> bcm911360_entphn
> bcm911360_entphn-ns
> bcm911360k
> bcm958300k-ns
> bcm958305k
> 
> - updates to support Cygnus and NSP board families better
> - add functions so CONFIG_ARMV7_NONSEC can be enabled on Cygnus boards
> 
> Signed-off-by: Steve Rae <srae@broadcom.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 22eb2d5..0da7068 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -508,12 +508,12 @@  config TARGET_BCM28155_AP
 	bool "Support bcm28155_ap"
 	select CPU_V7
 
-config TARGET_BCM958300K
-	bool "Support bcm958300k"
+config TARGET_BCMCYGNUS
+	bool "Support bcmcygnus"
 	select CPU_V7
 
-config TARGET_BCM958622HR
-	bool "Support bcm958622hr"
+config TARGET_BCMNSP
+	bool "Support bcmnsp"
 	select CPU_V7
 
 config ARCH_EXYNOS
@@ -842,8 +842,8 @@  source "board/bluegiga/apx4devkit/Kconfig"
 source "board/bluewater/snapper9260/Kconfig"
 source "board/boundary/nitrogen6x/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
-source "board/broadcom/bcm958300k/Kconfig"
-source "board/broadcom/bcm958622hr/Kconfig"
+source "board/broadcom/bcmcygnus/Kconfig"
+source "board/broadcom/bcmnsp/Kconfig"
 source "board/calao/sbc35_a9g20/Kconfig"
 source "board/calao/tny_a9260/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
diff --git a/board/broadcom/bcm911360_entphn-ns/MAINTAINERS b/board/broadcom/bcm911360_entphn-ns/MAINTAINERS
new file mode 100644
index 0000000..b5f0207
--- /dev/null
+++ b/board/broadcom/bcm911360_entphn-ns/MAINTAINERS
@@ -0,0 +1,6 @@ 
+BCM911360_ENTPHN-NS BOARD
+M:	Steve Rae <srae@broadcom.com>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm911360_entphn-ns_defconfig
diff --git a/board/broadcom/bcm911360_entphn/MAINTAINERS b/board/broadcom/bcm911360_entphn/MAINTAINERS
new file mode 100644
index 0000000..fb7ee2b
--- /dev/null
+++ b/board/broadcom/bcm911360_entphn/MAINTAINERS
@@ -0,0 +1,6 @@ 
+BCM911360_ENTPHN BOARD
+M:	Steve Rae <srae@broadcom.com>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm911360_entphn_defconfig
diff --git a/board/broadcom/bcm911360k/MAINTAINERS b/board/broadcom/bcm911360k/MAINTAINERS
new file mode 100644
index 0000000..754a15f
--- /dev/null
+++ b/board/broadcom/bcm911360k/MAINTAINERS
@@ -0,0 +1,6 @@ 
+BCM911360K BOARD
+M:	Steve Rae <srae@broadcom.com>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm911360k_defconfig
diff --git a/board/broadcom/bcm958300k-ns/MAINTAINERS b/board/broadcom/bcm958300k-ns/MAINTAINERS
new file mode 100644
index 0000000..763401a
--- /dev/null
+++ b/board/broadcom/bcm958300k-ns/MAINTAINERS
@@ -0,0 +1,6 @@ 
+BCM958300K-NS BOARD
+M:	Steve Rae <srae@broadcom.com>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm958300k-ns_defconfig
diff --git a/board/broadcom/bcm958300k/MAINTAINERS b/board/broadcom/bcm958300k/MAINTAINERS
index f75ee6e..8afc728 100644
--- a/board/broadcom/bcm958300k/MAINTAINERS
+++ b/board/broadcom/bcm958300k/MAINTAINERS
@@ -1,6 +1,6 @@ 
-Broadcom: Cygnus
+BCM958300K BOARD
 M:	Steve Rae <srae@broadcom.com>
 S:	Maintained
-F:	board/broadcom/bcm958300k/
+F:	board/broadcom/bcmcygnus/
 F:	include/configs/bcm_ep_board.h
 F:	configs/bcm958300k_defconfig
diff --git a/board/broadcom/bcm958305k/MAINTAINERS b/board/broadcom/bcm958305k/MAINTAINERS
new file mode 100644
index 0000000..179fd4e
--- /dev/null
+++ b/board/broadcom/bcm958305k/MAINTAINERS
@@ -0,0 +1,6 @@ 
+BCM958305K BOARD
+M:	Steve Rae <srae@broadcom.com>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm958305k_defconfig
diff --git a/board/broadcom/bcm958622hr/MAINTAINERS b/board/broadcom/bcm958622hr/MAINTAINERS
index c34272f..d08aded 100644
--- a/board/broadcom/bcm958622hr/MAINTAINERS
+++ b/board/broadcom/bcm958622hr/MAINTAINERS
@@ -1,6 +1,6 @@ 
-Broadcom: Northstar Plus
+BCM958622HR BOARD
 M:	Steve Rae <srae@broadcom.com>
 S:	Maintained
-F:	board/broadcom/bcm958622hr/
+F:	board/broadcom/bcmnsp/
 F:	include/configs/bcm_ep_board.h
 F:	configs/bcm958622hr_defconfig
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index e48cd3f..6a70a2e 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -53,3 +53,17 @@  int board_early_init_f(void)
 
 	return status;
 }
+
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
+void smp_set_core_boot_addr(unsigned long addr, int corenr)
+{
+}
+
+void smp_kick_all_cpus(void)
+{
+}
+
+void smp_waitloop(unsigned previous_address)
+{
+}
+#endif
diff --git a/board/broadcom/bcm958300k/Kconfig b/board/broadcom/bcmcygnus/Kconfig
similarity index 88%
rename from board/broadcom/bcm958300k/Kconfig
rename to board/broadcom/bcmcygnus/Kconfig
index 9289288..faba4cf 100644
--- a/board/broadcom/bcm958300k/Kconfig
+++ b/board/broadcom/bcmcygnus/Kconfig
@@ -1,4 +1,4 @@ 
-if TARGET_BCM958300K
+if TARGET_BCMCYGNUS
 
 config SYS_BOARD
 	default "bcm_ep"
diff --git a/board/broadcom/bcm958622hr/Kconfig b/board/broadcom/bcmnsp/Kconfig
similarity index 88%
rename from board/broadcom/bcm958622hr/Kconfig
rename to board/broadcom/bcmnsp/Kconfig
index 861c559..a975082 100644
--- a/board/broadcom/bcm958622hr/Kconfig
+++ b/board/broadcom/bcmnsp/Kconfig
@@ -1,4 +1,4 @@ 
-if TARGET_BCM958622HR
+if TARGET_BCMNSP
 
 config SYS_BOARD
 	default "bcm_ep"
diff --git a/configs/bcm911360_entphn-ns_defconfig b/configs/bcm911360_entphn-ns_defconfig
new file mode 100644
index 0000000..6f5c154
--- /dev/null
+++ b/configs/bcm911360_entphn-ns_defconfig
@@ -0,0 +1,3 @@ 
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000,ARMV7_NONSEC"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
diff --git a/configs/bcm911360_entphn_defconfig b/configs/bcm911360_entphn_defconfig
new file mode 100644
index 0000000..37b5846
--- /dev/null
+++ b/configs/bcm911360_entphn_defconfig
@@ -0,0 +1,3 @@ 
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig
new file mode 100644
index 0000000..527e407
--- /dev/null
+++ b/configs/bcm911360k_defconfig
@@ -0,0 +1,3 @@ 
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig
new file mode 100644
index 0000000..0e3aaa7
--- /dev/null
+++ b/configs/bcm958300k-ns_defconfig
@@ -0,0 +1,3 @@ 
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000,ARMV7_NONSEC"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig
index 066739d..527e407 100644
--- a/configs/bcm958300k_defconfig
+++ b/configs/bcm958300k_defconfig
@@ -1,3 +1,3 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
 CONFIG_ARM=y
-CONFIG_TARGET_BCM958300K=y
+CONFIG_TARGET_BCMCYGNUS=y
diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig
new file mode 100644
index 0000000..527e407
--- /dev/null
+++ b/configs/bcm958305k_defconfig
@@ -0,0 +1,3 @@ 
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
diff --git a/configs/bcm958622hr_defconfig b/configs/bcm958622hr_defconfig
index 8a45e51..7c86300 100644
--- a/configs/bcm958622hr_defconfig
+++ b/configs/bcm958622hr_defconfig
@@ -1,3 +1,3 @@ 
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000"
 CONFIG_ARM=y
-CONFIG_TARGET_BCM958622HR=y
+CONFIG_TARGET_BCMNSP=y