summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/uniphier/init_page_table.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-06 00:03:25 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-09 00:08:33 +0900
commitdc7246e725cda125382df548115e73e7e000728c (patch)
tree938652cbeb7bd63d176e3f3a2bd375256c64a73e /arch/arm/cpu/armv7/uniphier/init_page_table.c
parent230ce30a51a5fea81ec89ed906ed51975fc0984d (diff)
downloadtalos-obmc-uboot-dc7246e725cda125382df548115e73e7e000728c.tar.gz
talos-obmc-uboot-dc7246e725cda125382df548115e73e7e000728c.zip
ARM: UniPhier: extend register area of init page table for PH1-sLD3
0x20000000-0x2fffffff: assigned to ARM mpcore (sLD3 only) 0xf0000000-0xffffffff: assigned to Denali NAND controller (sLD3 only) Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu/armv7/uniphier/init_page_table.c')
-rw-r--r--arch/arm/cpu/armv7/uniphier/init_page_table.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/init_page_table.c b/arch/arm/cpu/armv7/uniphier/init_page_table.c
index d2738350a3..a0d10a995d 100644
--- a/arch/arm/cpu/armv7/uniphier/init_page_table.c
+++ b/arch/arm/cpu/armv7/uniphier/init_page_table.c
@@ -28,7 +28,12 @@
#define IS_SSC(x) ((IS_SPL_TEXT_AREA(x)) || \
(IS_INIT_STACK_AREA(x)))
#define IS_EXT(x) ((x) < 0x100)
-#define IS_REG(x) (0x500 <= (x) && (x) < 0x700)
+
+/* 0x20000000-0x2fffffff, 0xf0000000-0xffffffff are only used by PH1-sLD3 */
+#define IS_REG(x) (0x200 <= (x) && (x) < 0x300) || \
+ (0x500 <= (x) && (x) < 0x700) || \
+ (0xf00 <= (x))
+
#define IS_DDR(x) (0x800 <= (x) && (x) < 0xf00)
#define MMU_FLAGS(x) (IS_SSC(x)) ? SSC : \
OpenPOWER on IntegriCloud