Skip to contentSkip to conversation

ARM: bcm: Enable five Cygnus boards

PATCH New Steve Rae 2 participants 4 messages Nov 11, 2014 – Nov 24, 2014

Subsystems (3)
Arm (32-bit) Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture Broadcom iproc Arm architecture
lore
Share & tools
lore

Steve Rae

author
#0 lore raw

PATCH v2 1/2 ARM: bcm: Enable five Cygnus boards

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 <[email protected]>

---

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
arch/arm/Kconfig +6 -6
index 22eb2d5..0da7068 100644
@@ -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"
board/broadcom/bcm911360_entphn-ns/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..b5f0207
@@ -0,0 +1,6 @@
+BCM911360_ENTPHN-NS BOARD
+M:	Steve Rae <[email protected]>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm911360_entphn-ns_defconfig
board/broadcom/bcm911360_entphn/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..fb7ee2b
@@ -0,0 +1,6 @@
+BCM911360_ENTPHN BOARD
+M:	Steve Rae <[email protected]>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm911360_entphn_defconfig
board/broadcom/bcm911360k/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..754a15f
@@ -0,0 +1,6 @@
+BCM911360K BOARD
+M:	Steve Rae <[email protected]>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm911360k_defconfig
board/broadcom/bcm958300k-ns/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..763401a
@@ -0,0 +1,6 @@
+BCM958300K-NS BOARD
+M:	Steve Rae <[email protected]>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm958300k-ns_defconfig
board/broadcom/bcm958300k/MAINTAINERS +2 -2
index f75ee6e..8afc728 100644
@@ -1,6 +1,6 @@
-Broadcom: Cygnus
+BCM958300K BOARD
 M:	Steve Rae <[email protected]>
 S:	Maintained
-F:	board/broadcom/bcm958300k/
+F:	board/broadcom/bcmcygnus/
 F:	include/configs/bcm_ep_board.h
 F:	configs/bcm958300k_defconfig
board/broadcom/bcm958305k/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..179fd4e
@@ -0,0 +1,6 @@
+BCM958305K BOARD
+M:	Steve Rae <[email protected]>
+S:	Maintained
+F:	board/broadcom/bcmcygnus/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm958305k_defconfig
board/broadcom/bcm958622hr/MAINTAINERS +2 -2
index c34272f..d08aded 100644
@@ -1,6 +1,6 @@
-Broadcom: Northstar Plus
+BCM958622HR BOARD
 M:	Steve Rae <[email protected]>
 S:	Maintained
-F:	board/broadcom/bcm958622hr/
+F:	board/broadcom/bcmnsp/
 F:	include/configs/bcm_ep_board.h
 F:	configs/bcm958622hr_defconfig
board/broadcom/bcm_ep/board.c +14 -0
index e48cd3f..6a70a2e 100644
@@ -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
board/broadcom/bcmcygnus/Kconfig renamed from board/broadcom/bcm958300k/Kconfig +1 -1
similarity index 88%
rename from board/broadcom/bcm958300k/Kconfig
rename to board/broadcom/bcmcygnus/Kconfig
index 9289288..faba4cf 100644
@@ -1,4 +1,4 @@
-if TARGET_BCM958300K
+if TARGET_BCMCYGNUS
 
 config SYS_BOARD
 	default "bcm_ep"
board/broadcom/bcmnsp/Kconfig renamed from board/broadcom/bcm958622hr/Kconfig +1 -1
similarity index 88%
rename from board/broadcom/bcm958622hr/Kconfig
rename to board/broadcom/bcmnsp/Kconfig
index 861c559..a975082 100644
@@ -1,4 +1,4 @@
-if TARGET_BCM958622HR
+if TARGET_BCMNSP
 
 config SYS_BOARD
 	default "bcm_ep"
configs/bcm911360_entphn-ns_defconfig new file +3 -0
new file mode 100644
index 0000000..6f5c154
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000,ARMV7_NONSEC"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
configs/bcm911360_entphn_defconfig new file +3 -0
new file mode 100644
index 0000000..37b5846
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
configs/bcm911360k_defconfig new file +3 -0
new file mode 100644
index 0000000..527e407
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
configs/bcm958300k-ns_defconfig new file +3 -0
new file mode 100644
index 0000000..0e3aaa7
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000,ARMV7_NONSEC"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
configs/bcm958300k_defconfig +2 -2
index 066739d..527e407 100644
@@ -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
configs/bcm958305k_defconfig new file +3 -0
new file mode 100644
index 0000000..527e407
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y
configs/bcm958622hr_defconfig +1 -1
index 8a45e51..7c86300 100644
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000"
 CONFIG_ARM=y
-CONFIG_TARGET_BCM958622HR=y
+CONFIG_TARGET_BCMNSP=y
Signature · 1 line
1.8.5
author
#1 lore raw

PATCH v2 2/2 ARM: bcm: Enable bcm11130 boards

bcm11130
bcm11130_nand

Signed-off-by Steve Rae <[email protected]>

---

Changes in v2:
- split from previous commit

 board/broadcom/bcm11130/MAINTAINERS      | 6 ++++++
 board/broadcom/bcm11130_nand/MAINTAINERS | 6 ++++++
 configs/bcm11130_defconfig               | 3 +++
 configs/bcm11130_nand_defconfig          | 3 +++
 4 files changed, 18 insertions(+)
 create mode 100644 board/broadcom/bcm11130/MAINTAINERS
 create mode 100644 board/broadcom/bcm11130_nand/MAINTAINERS
 create mode 100644 configs/bcm11130_defconfig
 create mode 100644 configs/bcm11130_nand_defconfig
board/broadcom/bcm11130/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..b22e86f
@@ -0,0 +1,6 @@
+BCM11130 BOARD
+M:	Steve Rae <[email protected]>
+S:	Maintained
+F:	board/broadcom/bcm28155_ap/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm11130_defconfig
board/broadcom/bcm11130_nand/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000..881db5b
@@ -0,0 +1,6 @@
+BCM11130_NAND BOARD
+M:	Steve Rae <[email protected]>
+S:	Maintained
+F:	board/broadcom/bcm28155_ap/
+F:	include/configs/bcm_ep_board.h
+F:	configs/bcm11130_nand_defconfig
configs/bcm11130_defconfig new file +3 -0
new file mode 100644
index 0000000..f8c9f03
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_MMC_ENV_DEV=0"
+CONFIG_ARM=y
+CONFIG_TARGET_BCM28155_AP=y
configs/bcm11130_nand_defconfig new file +3 -0
new file mode 100644
index 0000000..39cb709
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_ARM=y
+CONFIG_TARGET_BCM28155_AP=y
Signature · 1 line
1.8.5
#2 lore raw

PATCH v2 2/2 ARM: bcm: Enable bcm11130 boards

Quoted 4 lines · Steve Rae

bcm11130
bcm11130_nand

Signed-off-by Steve Rae <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141124/85874bba/attachment.pgp>
#3 lore raw

PATCH v2 1/2 ARM: bcm: Enable five Cygnus boards

In reply to Steve Rae
Quoted 10 lines · Steve Rae

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 <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141124/ee0818f7/attachment.pgp>