Merge branch 'master'

2 files changed, 6 insertions, 3 deletions

diff --git a/include/asm-arm/arch-rpc/hardware.h b/include/asm-arm/arch-rpc/hardware.h
index 9d7f87375aa7..7480f4e8d974 100644
--- a/include/asm-arm/arch-rpc/hardware.h
+++ b/include/asm-arm/arch-rpc/hardware.h
@@ -46,7 +46,6 @@
 #define SCREEN_END              0xdfc00000
 #define SCREEN_BASE             0xdf800000
 
-#define FLUSH_BASE              0xdf000000
 #define UNCACHEABLE_ADDR        0xdf010000
 
 /*
@@ -59,8 +58,6 @@
 #define PCIO_BASE               IOMEM(0xe0010000)
 #define FLOPPYDMA_BASE          IOMEM(0xe002a000)
 
-#define FLUSH_BASE_PHYS         0x00000000      /* ROM */
-
 #define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
 
 #define IO_EC_EASI_BASE         0x81400000
diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h
index 0592cb3f0c74..303c424ce673 100644
--- a/include/asm-arm/arch-rpc/memory.h
+++ b/include/asm-arm/arch-rpc/memory.h
@@ -30,4 +30,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
 
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x00000000
+#define FLUSH_BASE              0xdf000000
+
 #endif