|
@@ -11,21 +11,27 @@
|
|
|
#ifndef __ASM_ARCH_MXC_MEMORY_H__
|
|
|
#define __ASM_ARCH_MXC_MEMORY_H__
|
|
|
|
|
|
-#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)
|
|
|
-#elif defined CONFIG_ARCH_MX25
|
|
|
-#define PHYS_OFFSET UL(0x80000000)
|
|
|
-#elif defined CONFIG_ARCH_MXC91231
|
|
|
-#define PHYS_OFFSET UL(0x90000000)
|
|
|
+#define MX1_PHYS_OFFSET UL(0x08000000)
|
|
|
+#define MX21_PHYS_OFFSET UL(0xc0000000)
|
|
|
+#define MX25_PHYS_OFFSET UL(0x80000000)
|
|
|
+#define MX27_PHYS_OFFSET UL(0xa0000000)
|
|
|
+#define MX3x_PHYS_OFFSET UL(0x80000000)
|
|
|
+#define MXC91231_PHYS_OFFSET UL(0x90000000)
|
|
|
+
|
|
|
+#if !defined(CONFIG_RUNTIME_PHYS_OFFSET)
|
|
|
+# if defined CONFIG_ARCH_MX1
|
|
|
+# define PHYS_OFFSET MX1_PHYS_OFFSET
|
|
|
+# elif defined CONFIG_MACH_MX21
|
|
|
+# define PHYS_OFFSET MX21_PHYS_OFFSET
|
|
|
+# elif defined CONFIG_ARCH_MX25
|
|
|
+# define PHYS_OFFSET MX25_PHYS_OFFSET
|
|
|
+# elif defined CONFIG_MACH_MX27
|
|
|
+# define PHYS_OFFSET MX27_PHYS_OFFSET
|
|
|
+# elif defined CONFIG_ARCH_MX3
|
|
|
+# define PHYS_OFFSET MX3x_PHYS_OFFSET
|
|
|
+# elif defined CONFIG_ARCH_MXC91231
|
|
|
+# define PHYS_OFFSET MXC91231_PHYS_OFFSET
|
|
|
+# endif
|
|
|
#endif
|
|
|
|
|
|
#if defined(CONFIG_MX1_VIDEO)
|