Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-mx5 / Makefile.boot

diff --git a/arch/arm/mach-mx5/Makefile.boot b/arch/arm/mach-mx5/Makefile.boot
index 9939a19d99a1fba431295b0ae189f74b2e61676a..e928be1b6757ed7b4ee9c17cd642a379c42e2ca1 100644 (file)
--- a/arch/arm/mach-mx5/Makefile.boot
+++ b/arch/arm/mach-mx5/Makefile.boot
@@ -1,3 +1,9 @@
-   zreladdr-y  := 0x90008000
-params_phys-y  := 0x90000100
-initrd_phys-y  := 0x90800000
+   zreladdr-$(CONFIG_ARCH_MX50)        := 0x70008000
+params_phys-$(CONFIG_ARCH_MX50)        := 0x70000100
+initrd_phys-$(CONFIG_ARCH_MX50)        := 0x70800000
+   zreladdr-$(CONFIG_ARCH_MX51)        := 0x90008000
+params_phys-$(CONFIG_ARCH_MX51)        := 0x90000100
+initrd_phys-$(CONFIG_ARCH_MX51)        := 0x90800000
+   zreladdr-$(CONFIG_ARCH_MX53)        := 0x70008000
+params_phys-$(CONFIG_ARCH_MX53)        := 0x70000100
+initrd_phys-$(CONFIG_ARCH_MX53)        := 0x70800000