diff options
author | Leo Chen <leochen@broadcom.com> | 2009-08-07 14:46:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 11:01:51 -0400 |
commit | 6288e28dce9bae24068b7341ebd72a7d176a3539 (patch) | |
tree | 5729034c7d65508a5e1bbc9d980e7861ba0920d2 /arch/arm | |
parent | 831f1f73a6e1a0a02a5eaa2da5f49cf09c7bb1af (diff) |
ARM: 5641/1: bcmring: add Kconfig and Makefile entries in arch/arm
add bcmring option in Kconfig and add entry in Makefile
in arch/arm directory
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 14 | ||||
-rw-r--r-- | arch/arm/Makefile | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index aef63c8e3d2d..c6d2b1988757 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -637,6 +637,18 @@ config ARCH_OMAP | |||
637 | help | 637 | help |
638 | Support for TI's OMAP platform (OMAP1 and OMAP2). | 638 | Support for TI's OMAP platform (OMAP1 and OMAP2). |
639 | 639 | ||
640 | config ARCH_BCMRING | ||
641 | bool "Broadcom BCMRING" | ||
642 | depends on MMU | ||
643 | select CPU_V6 | ||
644 | select ARM_AMBA | ||
645 | select COMMON_CLKDEV | ||
646 | select GENERIC_TIME | ||
647 | select GENERIC_CLOCKEVENTS | ||
648 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
649 | help | ||
650 | Support for Broadcom's BCMRing platform. | ||
651 | |||
640 | endchoice | 652 | endchoice |
641 | 653 | ||
642 | source "arch/arm/mach-clps711x/Kconfig" | 654 | source "arch/arm/mach-clps711x/Kconfig" |
@@ -730,6 +742,8 @@ source "arch/arm/mach-u300/Kconfig" | |||
730 | 742 | ||
731 | source "arch/arm/mach-w90x900/Kconfig" | 743 | source "arch/arm/mach-w90x900/Kconfig" |
732 | 744 | ||
745 | source "arch/arm/mach-bcmring/Kconfig" | ||
746 | |||
733 | # Definitions to make life easier | 747 | # Definitions to make life easier |
734 | config ARCH_ACORN | 748 | config ARCH_ACORN |
735 | bool | 749 | bool |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c877d6df23d1..b9ae98b88a7e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -112,6 +112,7 @@ endif | |||
112 | # by CONFIG_* macro name. | 112 | # by CONFIG_* macro name. |
113 | machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 | 113 | machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 |
114 | machine-$(CONFIG_ARCH_AT91) := at91 | 114 | machine-$(CONFIG_ARCH_AT91) := at91 |
115 | machine-$(CONFIG_ARCH_BCMRING) := bcmring | ||
115 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x | 116 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x |
116 | machine-$(CONFIG_ARCH_DAVINCI) := davinci | 117 | machine-$(CONFIG_ARCH_DAVINCI) := davinci |
117 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 | 118 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 |