diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-12-10 04:19:43 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-05 04:10:08 -0500 |
commit | bc727390f0a7d7069a39cd97451fa890caa0010e (patch) | |
tree | 8f33cd6eadd6dd79786380dcaa345cb64a67f15c /arch | |
parent | 95c00464dda726c49ac8c45228bee8bf395ffa97 (diff) |
imx: rename Kconfig symbol for "Eukrea CPUIMX27 module"
Not using MACH_CPUIMX27 makes machine_is_cpuimx27 always return 0
independent of building support for this machine.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Eric Benard <eric@eukrea.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx2/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-mx2/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-mx2/Kconfig index b96c6a389363..a8bc33749b28 100644 --- a/arch/arm/mach-mx2/Kconfig +++ b/arch/arm/mach-mx2/Kconfig | |||
@@ -55,7 +55,7 @@ config MACH_PCM970_BASEBOARD | |||
55 | 55 | ||
56 | endchoice | 56 | endchoice |
57 | 57 | ||
58 | config MACH_EUKREA_CPUIMX27 | 58 | config MACH_CPUIMX27 |
59 | bool "Eukrea CPUIMX27 module" | 59 | bool "Eukrea CPUIMX27 module" |
60 | depends on MACH_MX27 | 60 | depends on MACH_MX27 |
61 | help | 61 | help |
@@ -64,14 +64,14 @@ config MACH_EUKREA_CPUIMX27 | |||
64 | 64 | ||
65 | config MACH_EUKREA_CPUIMX27_USESDHC2 | 65 | config MACH_EUKREA_CPUIMX27_USESDHC2 |
66 | bool "CPUIMX27 integrates SDHC2 module" | 66 | bool "CPUIMX27 integrates SDHC2 module" |
67 | depends on MACH_EUKREA_CPUIMX27 | 67 | depends on MACH_CPUIMX27 |
68 | help | 68 | help |
69 | This adds support for the internal SDHC2 used on CPUIMX27 used | 69 | This adds support for the internal SDHC2 used on CPUIMX27 used |
70 | for wifi or eMMC. | 70 | for wifi or eMMC. |
71 | 71 | ||
72 | choice | 72 | choice |
73 | prompt "Baseboard" | 73 | prompt "Baseboard" |
74 | depends on MACH_EUKREA_CPUIMX27 | 74 | depends on MACH_CPUIMX27 |
75 | default MACH_EUKREA_MBIMX27_BASEBOARD | 75 | default MACH_EUKREA_MBIMX27_BASEBOARD |
76 | 76 | ||
77 | config MACH_EUKREA_MBIMX27_BASEBOARD | 77 | config MACH_EUKREA_MBIMX27_BASEBOARD |
diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-mx2/Makefile index 52aca0aaf9b5..2ba9997c7087 100644 --- a/arch/arm/mach-mx2/Makefile +++ b/arch/arm/mach-mx2/Makefile | |||
@@ -17,7 +17,7 @@ obj-$(CONFIG_MACH_PCM038) += pcm038.o | |||
17 | obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o | 17 | obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o |
18 | obj-$(CONFIG_MACH_MX27_3DS) += mx27pdk.o | 18 | obj-$(CONFIG_MACH_MX27_3DS) += mx27pdk.o |
19 | obj-$(CONFIG_MACH_MX27LITE) += mx27lite.o | 19 | obj-$(CONFIG_MACH_MX27LITE) += mx27lite.o |
20 | obj-$(CONFIG_MACH_EUKREA_CPUIMX27) += eukrea_cpuimx27.o | 20 | obj-$(CONFIG_MACH_CPUIMX27) += eukrea_cpuimx27.o |
21 | obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o | 21 | obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o |
22 | obj-$(CONFIG_MACH_PCA100) += pca100.o | 22 | obj-$(CONFIG_MACH_PCA100) += pca100.o |
23 | obj-$(CONFIG_MACH_MXT_TD60) += mxt_td60.o | 23 | obj-$(CONFIG_MACH_MXT_TD60) += mxt_td60.o |