From ae2537c221df45d8557301ff150a041830fe6c79 Mon Sep 17 00:00:00 2001
From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Mon, 26 Jan 2009 16:34:52 +0100
Subject: [PATCH] --- yaml --- r: 137203 b: refs/heads/master c:
 5512e88f3a1f1b498fd07181f14596ee117b3471 h: refs/heads/master i:   137201:
 e9fdc20baf177b01aa48d42cbbcf5a43794caf31   137199:
 94fce8e01ca21f8f96871d39e4d96188d86a23dc v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-mx2/Kconfig               | 13 +++++++++++++
 trunk/arch/arm/mach-mx2/Makefile.boot         | 10 +++++++---
 trunk/arch/arm/mach-mx2/serial.c              |  2 ++
 trunk/arch/arm/plat-mxc/include/mach/memory.h |  5 +++++
 trunk/arch/arm/plat-mxc/include/mach/mxc.h    |  4 ++++
 6 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b7ef742114cd..69c44f7c9409 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccfe30a7c8329e85ae426813a1060e27e2547dd1
+refs/heads/master: 5512e88f3a1f1b498fd07181f14596ee117b3471
diff --git a/trunk/arch/arm/mach-mx2/Kconfig b/trunk/arch/arm/mach-mx2/Kconfig
index 1eaa97cb716d..412d2d55b08c 100644
--- a/trunk/arch/arm/mach-mx2/Kconfig
+++ b/trunk/arch/arm/mach-mx2/Kconfig
@@ -1,12 +1,25 @@
 comment "MX2 family CPU support"
 	depends on ARCH_MX2
 
+choice
+	prompt "MX2 Type"
+	depends on ARCH_MX2
+	default MACH_MX21
+
+config MACH_MX21
+	bool "i.MX21 support"
+	depends on ARCH_MX2
+	help
+	  This enables support for Freescale's MX2 based i.MX21 processor.
+
 config MACH_MX27
 	bool "i.MX27 support"
 	depends on ARCH_MX2
 	help
 	  This enables support for Freescale's MX2 based i.MX27 processor.
 
+endchoice
+
 comment "MX2 Platforms"
 	depends on ARCH_MX2
 
diff --git a/trunk/arch/arm/mach-mx2/Makefile.boot b/trunk/arch/arm/mach-mx2/Makefile.boot
index 696831dcd485..e867398a8fdb 100644
--- a/trunk/arch/arm/mach-mx2/Makefile.boot
+++ b/trunk/arch/arm/mach-mx2/Makefile.boot
@@ -1,3 +1,7 @@
-   zreladdr-y	:= 0xA0008000
-params_phys-y	:= 0xA0000100
-initrd_phys-y	:= 0xA0800000
+zreladdr-$(CONFIG_MACH_MX21)	:= 0xC0008000
+params_phys-$(CONFIG_MACH_MX21)	:= 0xC0000100
+initrd_phys-$(CONFIG_MACH_MX21)	:= 0xC0800000
+
+zreladdr-$(CONFIG_MACH_MX27)	:= 0xA0008000
+params_phys-$(CONFIG_MACH_MX27)	:= 0xA0000100
+initrd_phys-$(CONFIG_MACH_MX27)	:= 0xA0800000
diff --git a/trunk/arch/arm/mach-mx2/serial.c b/trunk/arch/arm/mach-mx2/serial.c
index 16debc296dad..b9e66fb11860 100644
--- a/trunk/arch/arm/mach-mx2/serial.c
+++ b/trunk/arch/arm/mach-mx2/serial.c
@@ -99,6 +99,7 @@ struct platform_device mxc_uart_device3 = {
 	.num_resources = ARRAY_SIZE(uart3),
 };
 
+#ifdef CONFIG_MACH_MX27
 static struct resource uart4[] = {
 	{
 		.start = UART5_BASE_ADDR,
@@ -136,3 +137,4 @@ struct platform_device mxc_uart_device5 = {
 	.resource = uart5,
 	.num_resources = ARRAY_SIZE(uart5),
 };
+#endif
diff --git a/trunk/arch/arm/plat-mxc/include/mach/memory.h b/trunk/arch/arm/plat-mxc/include/mach/memory.h
index 0b808399097f..e0783e619580 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/memory.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/memory.h
@@ -14,7 +14,12 @@
 #if defined CONFIG_ARCH_MX1
 #define PHYS_OFFSET		UL(0x08000000)
 #elif defined CONFIG_ARCH_MX2
+#ifdef CONFIG_MACH_MX21
+#define PHYS_OFFSET		UL(0xC0000000)
+#endif
+#ifdef CONFIG_MACH_MX27
 #define PHYS_OFFSET		UL(0xA0000000)
+#endif
 #elif defined CONFIG_ARCH_MX3
 #define PHYS_OFFSET		UL(0x80000000)
 #endif
diff --git a/trunk/arch/arm/plat-mxc/include/mach/mxc.h b/trunk/arch/arm/plat-mxc/include/mach/mxc.h
index f6caab062131..bbd848e004d7 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/mxc.h
@@ -29,6 +29,10 @@
 # define cpu_is_mx31() (0)
 #endif
 
+#ifndef CONFIG_MACH_MX21
+# define cpu_is_mx21() (0)
+#endif
+
 #ifndef CONFIG_MACH_MX27
 # define cpu_is_mx27() (0)
 #endif