diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2009-04-27 05:21:46 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-28 17:44:29 -0400 |
commit | d98aac7592114241f378bc8d5b3e424cced7ded2 (patch) | |
tree | 2d052df037411e94478d5ee4ff43402a45fd8fe4 /arch/arm/Kconfig | |
parent | bb3cee2b35d2b9edab71997bd06040ff37483e08 (diff) |
[ARM] 5480/1: U300-v5 integrate into the ARM architecture
This hooks the U300 support into Kbuild and makes a small hook
in mmu.c for supporting an odd memory alignment with shared memory
on these systems.
This is rebased to RMK:s GIT HEAD. This patch tries to add the
Kconfig option in alphabetic order by option text and the Makefile
entry after config symbol.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a930e5c5672c..44456e163025 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -594,6 +594,20 @@ config ARCH_LH7A40X | |||
594 | core with a wide array of integrated devices for | 594 | core with a wide array of integrated devices for |
595 | hand-held and low-power applications. | 595 | hand-held and low-power applications. |
596 | 596 | ||
597 | config ARCH_U300 | ||
598 | bool "ST-Ericsson U300 Series" | ||
599 | depends on MMU | ||
600 | select CPU_ARM926T | ||
601 | select ARM_AMBA | ||
602 | select ARM_VIC | ||
603 | select GENERIC_TIME | ||
604 | select GENERIC_CLOCKEVENTS | ||
605 | select HAVE_CLK | ||
606 | select COMMON_CLKDEV | ||
607 | select GENERIC_GPIO | ||
608 | help | ||
609 | Support for ST-Ericsson U300 series mobile platforms. | ||
610 | |||
597 | config ARCH_DAVINCI | 611 | config ARCH_DAVINCI |
598 | bool "TI DaVinci" | 612 | bool "TI DaVinci" |
599 | select CPU_ARM926T | 613 | select CPU_ARM926T |
@@ -705,6 +719,8 @@ source "arch/arm/mach-ks8695/Kconfig" | |||
705 | 719 | ||
706 | source "arch/arm/mach-msm/Kconfig" | 720 | source "arch/arm/mach-msm/Kconfig" |
707 | 721 | ||
722 | source "arch/arm/mach-u300/Kconfig" | ||
723 | |||
708 | source "arch/arm/mach-w90x900/Kconfig" | 724 | source "arch/arm/mach-w90x900/Kconfig" |
709 | 725 | ||
710 | # Definitions to make life easier | 726 | # Definitions to make life easier |