diff options
author | Josh Cartwright <josh.cartwright@ni.com> | 2012-11-19 12:38:29 -0500 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2012-11-21 04:52:13 -0500 |
commit | 9a45eb691d8712b64a733178746557f708043444 (patch) | |
tree | 13dc80bff8935c32e7fa209891ff03cfb89dc809 /arch/arm/Kconfig | |
parent | 385f02b1696004461d89589e69ae7247081a74a2 (diff) |
ARM: zynq: add support for ARCH_MULTIPLATFORM
The majority of changes are necessary to remove dependencies on header
files within arch/arm/mach-zynq/include/mach:
uncompress.h
- Deleted. It is unused for ARCH_MULTIPLATFORM builds.
uart.h:
- Move uart definitions out of uart.h into debug/zynq.S, which is
now the only user
zynq_soc.h:
- Move SCU address definitions into common.c.
- Other #defines, such as PERIPHERAL_CLOCK_RATE, TTC0_BASE, etc, are
unused and can be dropped
Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ccfe0ab8c877..28a204801ccf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -955,18 +955,6 @@ config ARCH_VT8500 | |||
955 | help | 955 | help |
956 | Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. | 956 | Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. |
957 | 957 | ||
958 | config ARCH_ZYNQ | ||
959 | bool "Xilinx Zynq ARM Cortex A9 Platform" | ||
960 | select ARM_AMBA | ||
961 | select ARM_GIC | ||
962 | select COMMON_CLK | ||
963 | select CPU_V7 | ||
964 | select GENERIC_CLOCKEVENTS | ||
965 | select ICST | ||
966 | select MIGHT_HAVE_CACHE_L2X0 | ||
967 | select USE_OF | ||
968 | help | ||
969 | Support for Xilinx Zynq ARM Cortex A9 Platform | ||
970 | endchoice | 958 | endchoice |
971 | 959 | ||
972 | menu "Multiple platform selection" | 960 | menu "Multiple platform selection" |
@@ -1128,6 +1116,8 @@ source "arch/arm/plat-versatile/Kconfig" | |||
1128 | 1116 | ||
1129 | source "arch/arm/mach-w90x900/Kconfig" | 1117 | source "arch/arm/mach-w90x900/Kconfig" |
1130 | 1118 | ||
1119 | source "arch/arm/mach-zynq/Kconfig" | ||
1120 | |||
1131 | # Definitions to make life easier | 1121 | # Definitions to make life easier |
1132 | config ARCH_ACORN | 1122 | config ARCH_ACORN |
1133 | bool | 1123 | bool |