Browse Source

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 <srae@broadcom.com>
Steve Rae 10 years ago
parent
commit
abb1678cca

+ 6 - 6
arch/arm/Kconfig

@@ -521,12 +521,12 @@ config TARGET_BCM28155_AP
 	bool "Support bcm28155_ap"
 	bool "Support bcm28155_ap"
 	select CPU_V7
 	select CPU_V7
 
 
-config TARGET_BCM958300K
-	bool "Support bcm958300k"
+config TARGET_BCMCYGNUS
+	bool "Support bcmcygnus"
 	select CPU_V7
 	select CPU_V7
 
 
-config TARGET_BCM958622HR
-	bool "Support bcm958622hr"
+config TARGET_BCMNSP
+	bool "Support bcmnsp"
 	select CPU_V7
 	select CPU_V7
 
 
 config ARCH_EXYNOS
 config ARCH_EXYNOS
@@ -861,8 +861,8 @@ source "board/bluegiga/apx4devkit/Kconfig"
 source "board/bluewater/snapper9260/Kconfig"
 source "board/bluewater/snapper9260/Kconfig"
 source "board/boundary/nitrogen6x/Kconfig"
 source "board/boundary/nitrogen6x/Kconfig"
 source "board/broadcom/bcm28155_ap/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/sbc35_a9g20/Kconfig"
 source "board/calao/tny_a9260/Kconfig"
 source "board/calao/tny_a9260/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
 source "board/calao/usb_a9263/Kconfig"

+ 6 - 0
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

+ 6 - 0
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

+ 6 - 0
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

+ 6 - 0
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

+ 2 - 2
board/broadcom/bcm958300k/MAINTAINERS

@@ -1,6 +1,6 @@
-Broadcom: Cygnus
+BCM958300K BOARD
 M:	Steve Rae <srae@broadcom.com>
 M:	Steve Rae <srae@broadcom.com>
 S:	Maintained
 S:	Maintained
-F:	board/broadcom/bcm958300k/
+F:	board/broadcom/bcmcygnus/
 F:	include/configs/bcm_ep_board.h
 F:	include/configs/bcm_ep_board.h
 F:	configs/bcm958300k_defconfig
 F:	configs/bcm958300k_defconfig

+ 6 - 0
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

+ 2 - 2
board/broadcom/bcm958622hr/MAINTAINERS

@@ -1,6 +1,6 @@
-Broadcom: Northstar Plus
+BCM958622HR BOARD
 M:	Steve Rae <srae@broadcom.com>
 M:	Steve Rae <srae@broadcom.com>
 S:	Maintained
 S:	Maintained
-F:	board/broadcom/bcm958622hr/
+F:	board/broadcom/bcmnsp/
 F:	include/configs/bcm_ep_board.h
 F:	include/configs/bcm_ep_board.h
 F:	configs/bcm958622hr_defconfig
 F:	configs/bcm958622hr_defconfig

+ 14 - 0
board/broadcom/bcm_ep/board.c

@@ -53,3 +53,17 @@ int board_early_init_f(void)
 
 
 	return status;
 	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

+ 1 - 1
board/broadcom/bcm958300k/Kconfig → board/broadcom/bcmcygnus/Kconfig

@@ -1,4 +1,4 @@
-if TARGET_BCM958300K
+if TARGET_BCMCYGNUS
 
 
 config SYS_BOARD
 config SYS_BOARD
 	default "bcm_ep"
 	default "bcm_ep"

+ 1 - 1
board/broadcom/bcm958622hr/Kconfig → board/broadcom/bcmnsp/Kconfig

@@ -1,4 +1,4 @@
-if TARGET_BCM958622HR
+if TARGET_BCMNSP
 
 
 config SYS_BOARD
 config SYS_BOARD
 	default "bcm_ep"
 	default "bcm_ep"

+ 3 - 0
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

+ 3 - 0
configs/bcm911360_entphn_defconfig

@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y

+ 3 - 0
configs/bcm911360k_defconfig

@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y

+ 3 - 0
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

+ 2 - 2
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_ARM=y
-CONFIG_TARGET_BCM958300K=y
+CONFIG_TARGET_BCMCYGNUS=y

+ 3 - 0
configs/bcm958305k_defconfig

@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
+CONFIG_ARM=y
+CONFIG_TARGET_BCMCYGNUS=y

+ 1 - 1
configs/bcm958622hr_defconfig

@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000"
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_TARGET_BCM958622HR=y
+CONFIG_TARGET_BCMNSP=y