mm: fix first 256MB lost problem

PD#157955: fix first 256MB lost problem

1. add Makefile.boot for define of ZRELADDR/
   PARAMS_PHYS/INITRD_PHYS
2. remove config of ARM_PATCH_PHYS_VIRT/AUTO_ZRELADDR
   to avoid boot panic when first 256MB memory enabled

Change-Id: I0495803f22bcfaa550437169a345adc988b40ef7
Signed-off-by: tao zeng <tao.zeng@amlogic.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f12435..fbb96dd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13497,6 +13497,10 @@ AMLOGIC driver for pmu
 M: Tao Zeng <tao.zeng@amlogic.com>
 F: drivers/amlogic/power/*
 
+AMLOGIC boot config for M8B
+M: Tao Zeng <tao.zeng@amlogic.com>
+F: arch/arm/mach-meson/Makefile.boot
+
 HDMITX OUTPUT DRIVER
 M:     Zongdong Jiao <zongdong.jiao@amlogic.com>
 M:     Yi Zhou <yi.zhou@amlogic.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6f73ded..3e96c07 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -241,7 +241,6 @@ config VECTORS_BASE
 
 config ARM_PATCH_PHYS_VIRT
        bool "Patch physical to virtual translations at runtime" if EMBEDDED
-       default y
        depends on !XIP_KERNEL && MMU
        help
          Patch phys-to-virt and virt-to-phys translation functions at
@@ -330,8 +329,6 @@ config ARCH_MULTIPLATFORM
        bool "Allow multiple platforms to be selected"
        depends on MMU
        select ARM_HAS_SG_CHAIN
-       select ARM_PATCH_PHYS_VIRT
-       select AUTO_ZRELADDR
        select CLKSRC_OF
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index da75630..30fd2ed 100644 (file)
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -16,6 +16,11 @@ OBJCOPYFLAGS :=-O binary -R .comment -S
 ifneq ($(MACHINE),)
 include $(MACHINE)/Makefile.boot
 endif
+
+ifeq ($(CONFIG_MACH_MESON8B),y)
+include $(srctree)/arch/arm/mach-meson/Makefile.boot
+endif
+
 include $(srctree)/arch/arm/boot/dts/Makefile
 
 # Note: the following conditions must always be true:

diff --git a/arch/arm/mach-meson/Makefile.boot b/arch/arm/mach-meson/Makefile.boot
new file mode 100644 (file)
index 0000000..570d19a
--- /dev/null
+++ b/arch/arm/mach-meson/Makefile.boot
@@ -0,0 +1,3 @@
+   zreladdr-y    += 0x00208000
+params_phys-y    := 0x00200100
+initrd_phys-y    := 0x00a00000