From abb1678cca69e4259f01a10f6da2828394d26046 Mon Sep 17 00:00:00 2001 From: Steve Rae Date: Tue, 11 Nov 2014 11:32:18 -0800 Subject: 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 --- 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/Kconfig | 15 --------------- board/broadcom/bcm958300k/MAINTAINERS | 4 ++-- board/broadcom/bcm958305k/MAINTAINERS | 6 ++++++ board/broadcom/bcm958622hr/Kconfig | 15 --------------- board/broadcom/bcm958622hr/MAINTAINERS | 4 ++-- board/broadcom/bcm_ep/board.c | 14 ++++++++++++++ board/broadcom/bcmcygnus/Kconfig | 15 +++++++++++++++ board/broadcom/bcmnsp/Kconfig | 15 +++++++++++++++ 12 files changed, 78 insertions(+), 34 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 delete mode 100644 board/broadcom/bcm958300k/Kconfig create mode 100644 board/broadcom/bcm958305k/MAINTAINERS delete mode 100644 board/broadcom/bcm958622hr/Kconfig create mode 100644 board/broadcom/bcmcygnus/Kconfig create mode 100644 board/broadcom/bcmnsp/Kconfig (limited to 'board/broadcom') diff --git a/board/broadcom/bcm911360_entphn-ns/MAINTAINERS b/board/broadcom/bcm911360_entphn-ns/MAINTAINERS new file mode 100644 index 0000000000..b5f0207140 --- /dev/null +++ b/board/broadcom/bcm911360_entphn-ns/MAINTAINERS @@ -0,0 +1,6 @@ +BCM911360_ENTPHN-NS BOARD +M: Steve Rae +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 0000000000..fb7ee2bbc6 --- /dev/null +++ b/board/broadcom/bcm911360_entphn/MAINTAINERS @@ -0,0 +1,6 @@ +BCM911360_ENTPHN BOARD +M: Steve Rae +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 0000000000..754a15f0c7 --- /dev/null +++ b/board/broadcom/bcm911360k/MAINTAINERS @@ -0,0 +1,6 @@ +BCM911360K BOARD +M: Steve Rae +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 0000000000..763401a3f1 --- /dev/null +++ b/board/broadcom/bcm958300k-ns/MAINTAINERS @@ -0,0 +1,6 @@ +BCM958300K-NS BOARD +M: Steve Rae +S: Maintained +F: board/broadcom/bcmcygnus/ +F: include/configs/bcm_ep_board.h +F: configs/bcm958300k-ns_defconfig diff --git a/board/broadcom/bcm958300k/Kconfig b/board/broadcom/bcm958300k/Kconfig deleted file mode 100644 index 92892881af..0000000000 --- a/board/broadcom/bcm958300k/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_BCM958300K - -config SYS_BOARD - default "bcm_ep" - -config SYS_VENDOR - default "broadcom" - -config SYS_SOC - default "bcmcygnus" - -config SYS_CONFIG_NAME - default "bcm_ep_board" - -endif diff --git a/board/broadcom/bcm958300k/MAINTAINERS b/board/broadcom/bcm958300k/MAINTAINERS index f75ee6e73c..8afc728a25 100644 --- a/board/broadcom/bcm958300k/MAINTAINERS +++ b/board/broadcom/bcm958300k/MAINTAINERS @@ -1,6 +1,6 @@ -Broadcom: Cygnus +BCM958300K BOARD M: Steve Rae 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 0000000000..179fd4ee9e --- /dev/null +++ b/board/broadcom/bcm958305k/MAINTAINERS @@ -0,0 +1,6 @@ +BCM958305K BOARD +M: Steve Rae +S: Maintained +F: board/broadcom/bcmcygnus/ +F: include/configs/bcm_ep_board.h +F: configs/bcm958305k_defconfig diff --git a/board/broadcom/bcm958622hr/Kconfig b/board/broadcom/bcm958622hr/Kconfig deleted file mode 100644 index 861c55909b..0000000000 --- a/board/broadcom/bcm958622hr/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_BCM958622HR - -config SYS_BOARD - default "bcm_ep" - -config SYS_VENDOR - default "broadcom" - -config SYS_SOC - default "bcmnsp" - -config SYS_CONFIG_NAME - default "bcm_ep_board" - -endif diff --git a/board/broadcom/bcm958622hr/MAINTAINERS b/board/broadcom/bcm958622hr/MAINTAINERS index c34272f70d..d08aded83f 100644 --- a/board/broadcom/bcm958622hr/MAINTAINERS +++ b/board/broadcom/bcm958622hr/MAINTAINERS @@ -1,6 +1,6 @@ -Broadcom: Northstar Plus +BCM958622HR BOARD M: Steve Rae 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 e48cd3f767..6a70a2e305 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/bcmcygnus/Kconfig b/board/broadcom/bcmcygnus/Kconfig new file mode 100644 index 0000000000..faba4cf82b --- /dev/null +++ b/board/broadcom/bcmcygnus/Kconfig @@ -0,0 +1,15 @@ +if TARGET_BCMCYGNUS + +config SYS_BOARD + default "bcm_ep" + +config SYS_VENDOR + default "broadcom" + +config SYS_SOC + default "bcmcygnus" + +config SYS_CONFIG_NAME + default "bcm_ep_board" + +endif diff --git a/board/broadcom/bcmnsp/Kconfig b/board/broadcom/bcmnsp/Kconfig new file mode 100644 index 0000000000..a975082355 --- /dev/null +++ b/board/broadcom/bcmnsp/Kconfig @@ -0,0 +1,15 @@ +if TARGET_BCMNSP + +config SYS_BOARD + default "bcm_ep" + +config SYS_VENDOR + default "broadcom" + +config SYS_SOC + default "bcmnsp" + +config SYS_CONFIG_NAME + default "bcm_ep_board" + +endif -- cgit v1.2.1