Merge tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-u300 / Makefile.boot

diff --git a/arch/arm/mach-u300/Makefile.boot b/arch/arm/mach-u300/Makefile.boot
index 69357affbd77f9eb2799ee4b16fadbf2b382ae28..87811de0bd947cb4b516f54185e71b745562dc22 100644 (file)
--- a/arch/arm/mach-u300/Makefile.boot
+++ b/arch/arm/mach-u300/Makefile.boot
@@ -1,15 +1,4 @@
-# Note: the following conditions must always be true:
-#   ZRELADDR == virt_to_phys(TEXTADDR)
-#   PARAMS_PHYS must be within 4MB of ZRELADDR
-#   INITRD_PHYS must be in RAM
-
-ifdef CONFIG_MACH_U300_SINGLE_RAM
-     zreladdr-y        += 0x28E08000
-  params_phys-y        := 0x28E00100
-else
-     zreladdr-y        += 0x48008000
-  params_phys-y        := 0x48000100
-endif
-
+   zreladdr-y  += 0x48008000
+params_phys-y  := 0x48000100
 # This isn't used.
-#initrd_phys-y := 0x29800000
+#initrd_phys-y := 0x48800000