diff options
author | Shawn Guo <shawn.guo@freescale.com> | 2010-12-13 07:55:03 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-12-20 11:30:44 -0500 |
commit | 1d3f33d541312acd34bd2fa780396d111a0f73b1 (patch) | |
tree | 3eac23319f75a9423a4df5145a6a27baa58e8ef7 | |
parent | 4afbbb7c1b20dc10513c522849735a3293243af8 (diff) |
ARM: mxs: Add build configuration for mxs
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-rw-r--r-- | arch/arm/Kconfig | 10 | ||||
-rw-r--r-- | arch/arm/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-mxs/Kconfig | 34 | ||||
-rw-r--r-- | arch/arm/mach-mxs/Makefile | 10 | ||||
-rw-r--r-- | arch/arm/mach-mxs/Makefile.boot | 1 | ||||
-rw-r--r-- | arch/arm/mach-mxs/devices/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-mxs/devices/Makefile | 2 |
7 files changed, 63 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f1d9297b1050..0f3417065d13 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -351,6 +351,14 @@ config ARCH_MXC | |||
351 | help | 351 | help |
352 | Support for Freescale MXC/iMX-based family of processors | 352 | Support for Freescale MXC/iMX-based family of processors |
353 | 353 | ||
354 | config ARCH_MXS | ||
355 | bool "Freescale MXS-based" | ||
356 | select GENERIC_CLOCKEVENTS | ||
357 | select ARCH_REQUIRE_GPIOLIB | ||
358 | select COMMON_CLKDEV | ||
359 | help | ||
360 | Support for Freescale MXS-based family of processors | ||
361 | |||
354 | config ARCH_STMP3XXX | 362 | config ARCH_STMP3XXX |
355 | bool "Freescale STMP3xxx" | 363 | bool "Freescale STMP3xxx" |
356 | select CPU_ARM926T | 364 | select CPU_ARM926T |
@@ -902,6 +910,8 @@ source "arch/arm/mach-mv78xx0/Kconfig" | |||
902 | 910 | ||
903 | source "arch/arm/plat-mxc/Kconfig" | 911 | source "arch/arm/plat-mxc/Kconfig" |
904 | 912 | ||
913 | source "arch/arm/mach-mxs/Kconfig" | ||
914 | |||
905 | source "arch/arm/mach-netx/Kconfig" | 915 | source "arch/arm/mach-netx/Kconfig" |
906 | 916 | ||
907 | source "arch/arm/mach-nomadik/Kconfig" | 917 | source "arch/arm/mach-nomadik/Kconfig" |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b87aed028eef..485cad1bb816 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -158,6 +158,7 @@ machine-$(CONFIG_ARCH_MX25) := mx25 | |||
158 | machine-$(CONFIG_ARCH_MX3) := mx3 | 158 | machine-$(CONFIG_ARCH_MX3) := mx3 |
159 | machine-$(CONFIG_ARCH_MX5) := mx5 | 159 | machine-$(CONFIG_ARCH_MX5) := mx5 |
160 | machine-$(CONFIG_ARCH_MXC91231) := mxc91231 | 160 | machine-$(CONFIG_ARCH_MXC91231) := mxc91231 |
161 | machine-$(CONFIG_ARCH_MXS) := mxs | ||
161 | machine-$(CONFIG_ARCH_NETX) := netx | 162 | machine-$(CONFIG_ARCH_NETX) := netx |
162 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik | 163 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik |
163 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | 164 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx |
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig new file mode 100644 index 000000000000..c4ac7b415195 --- /dev/null +++ b/arch/arm/mach-mxs/Kconfig | |||
@@ -0,0 +1,34 @@ | |||
1 | if ARCH_MXS | ||
2 | |||
3 | source "arch/arm/mach-mxs/devices/Kconfig" | ||
4 | |||
5 | config SOC_IMX23 | ||
6 | bool | ||
7 | select CPU_ARM926T | ||
8 | |||
9 | config SOC_IMX28 | ||
10 | bool | ||
11 | select CPU_ARM926T | ||
12 | |||
13 | comment "MXS platforms:" | ||
14 | |||
15 | config MACH_MX23EVK | ||
16 | bool "Support MX23EVK Platform" | ||
17 | select SOC_IMX23 | ||
18 | select MXS_HAVE_PLATFORM_DUART | ||
19 | default y | ||
20 | help | ||
21 | Include support for MX23EVK platform. This includes specific | ||
22 | configurations for the board and its peripherals. | ||
23 | |||
24 | config MACH_MX28EVK | ||
25 | bool "Support MX28EVK Platform" | ||
26 | select SOC_IMX28 | ||
27 | select MXS_HAVE_PLATFORM_DUART | ||
28 | select MXS_HAVE_PLATFORM_FEC | ||
29 | default y | ||
30 | help | ||
31 | Include support for MX28EVK platform. This includes specific | ||
32 | configurations for the board and its peripherals. | ||
33 | |||
34 | endif | ||
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile new file mode 100644 index 000000000000..39d3f9c2a841 --- /dev/null +++ b/arch/arm/mach-mxs/Makefile | |||
@@ -0,0 +1,10 @@ | |||
1 | # Common support | ||
2 | obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o | ||
3 | |||
4 | obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o | ||
5 | obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o | ||
6 | |||
7 | obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o | ||
8 | obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o | ||
9 | |||
10 | obj-y += devices/ | ||
diff --git a/arch/arm/mach-mxs/Makefile.boot b/arch/arm/mach-mxs/Makefile.boot new file mode 100644 index 000000000000..eb541e0291da --- /dev/null +++ b/arch/arm/mach-mxs/Makefile.boot | |||
@@ -0,0 +1 @@ | |||
zreladdr-y := 0x40008000 | |||
diff --git a/arch/arm/mach-mxs/devices/Kconfig b/arch/arm/mach-mxs/devices/Kconfig new file mode 100644 index 000000000000..a35a2dc55395 --- /dev/null +++ b/arch/arm/mach-mxs/devices/Kconfig | |||
@@ -0,0 +1,5 @@ | |||
1 | config MXS_HAVE_PLATFORM_DUART | ||
2 | bool | ||
3 | |||
4 | config MXS_HAVE_PLATFORM_FEC | ||
5 | bool | ||
diff --git a/arch/arm/mach-mxs/devices/Makefile b/arch/arm/mach-mxs/devices/Makefile new file mode 100644 index 000000000000..4b5266a3e6d9 --- /dev/null +++ b/arch/arm/mach-mxs/devices/Makefile | |||
@@ -0,0 +1,2 @@ | |||
1 | obj-$(CONFIG_MXS_HAVE_PLATFORM_DUART) += platform-duart.o | ||
2 | obj-$(CONFIG_MXS_HAVE_PLATFORM_FEC) += platform-fec.o | ||