3 files changed, 22 insertions, 5 deletions

diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 10d56b1fd53..3f4f3415505 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -5,6 +5,10 @@ config TI_KEYSTONE
 
 menu "TI KeyStone Implementations"
 
+config KEYSTONE_RECOVERY_KERNEL
+        bool "Build recovery kernel"
+        default n
+
 config KEYSTONE2_DMA_COHERENT
         bool "MPAX based coherency support"
         default n
diff --git a/arch/arm/mach-keystone/Makefile.boot b/arch/arm/mach-keystone/Makefile.boot
index f3835c43af6..987cd83548b 100644
--- a/arch/arm/mach-keystone/Makefile.boot
+++ b/arch/arm/mach-keystone/Makefile.boot
@@ -1 +1,2 @@
-zreladdr-y      := 0x80008000
+zreladdr-$(CONFIG_KEYSTONE_RECOVERY_KERNEL)     := 0x90008000
+zreladdr-y      ?= 0x80008000
diff --git a/arch/arm/mach-keystone/include/mach/memory.h b/arch/arm/mach-keystone/include/mach/memory.h
index 514682e9f99..411a4d98f32 100644
--- a/arch/arm/mach-keystone/include/mach/memory.h
+++ b/arch/arm/mach-keystone/include/mach/memory.h
@@ -19,13 +19,19 @@
 #define MAX_PHYSMEM_BITS        36
 #define SECTION_SIZE_BITS       34
 
-#define KEYSTONE_LOW_PHYS_START         0x80000000ULL
-#define KEYSTONE_LOW_PHYS_SIZE          0x80000000ULL /* 2G */
+#ifdef CONFIG_KEYSTONE_RECOVERY_KERNEL
+#define REC_OFFSET      0x10000000ULL
+#else
+#define REC_OFFSET      0
+#endif
+
+#define KEYSTONE_LOW_PHYS_START         (0x80000000ULL + REC_OFFSET)
+#define KEYSTONE_LOW_PHYS_SIZE          (0x80000000ULL - REC_OFFSET)
 #define KEYSTONE_LOW_PHYS_END           (KEYSTONE_LOW_PHYS_START + \
                                          KEYSTONE_LOW_PHYS_SIZE - 1)
 
-#define KEYSTONE_HIGH_PHYS_START        0x800000000ULL
-#define KEYSTONE_HIGH_PHYS_SIZE         0x400000000ULL  /* 16G */
+#define KEYSTONE_HIGH_PHYS_START        (0x800000000ULL + REC_OFFSET)
+#define KEYSTONE_HIGH_PHYS_SIZE         (0x400000000ULL - REC_OFFSET)
 #define KEYSTONE_HIGH_PHYS_END          (KEYSTONE_HIGH_PHYS_START + \
                                          KEYSTONE_HIGH_PHYS_SIZE - 1)
 
@@ -37,9 +43,15 @@
 
 #ifndef __ASSEMBLY__
 
+static inline phys_addr_t __virt_to_phys(unsigned long x);
+
 static inline phys_addr_t __virt_to_idmap(unsigned long x)
 {
+#ifdef CONFIG_KEYSTONE_RECOVERY_KERNEL
+        return __virt_to_phys(x) - KEYSTONE_HIGH_PHYS_START +
+#else
         return (phys_addr_t)(x) - CONFIG_PAGE_OFFSET +
+#endif
                 KEYSTONE_LOW_PHYS_START;
 }