summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-03-11 17:44:19 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-03-14 10:56:47 +0100
commit9e256213b86c25ef5cb5c999ad523eff5a4a6555 (patch)
treef07b2585b410b5a372a296ea8c334f64d1a0feff /c
parentmpc83xx: Add MPC83XX_HAS_NAND_LP_FLASH_ON_CS0 (diff)
downloadrtems-9e256213b86c25ef5cb5c999ad523eff5a4a6555.tar.bz2
mpc83xx: Fix local access window 1 configuration
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/powerpc/gen83xx/start/start.S10
1 files changed, 10 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/start/start.S b/c/src/lib/libbsp/powerpc/gen83xx/start/start.S
index df06d29cb6..2c67bf8c5e 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/start/start.S
+++ b/c/src/lib/libbsp/powerpc/gen83xx/start/start.S
@@ -138,12 +138,22 @@ start_code_in_rom:
#ifdef LBLAWAR0_VAL
SET_IMM_REGW r31,r30,LBLAWAR0_OFF,LBLAWAR0_VAL
#endif
+
+/*
+ * Local access window 1 is a special case since we used it for a temporary
+ * mapping. If we do not use it then restore the reset value.
+ */
#ifdef LBLAWBAR1_VAL
SET_IMM_REGW r31,r30,LBLAWBAR1_OFF,LBLAWBAR1_VAL
+#else
+ SET_IMM_REGW r31,r30,LBLAWBAR1_OFF,0
#endif
#ifdef LBLAWAR1_VAL
SET_IMM_REGW r31,r30,LBLAWAR1_OFF,LBLAWAR1_VAL
+#else
+ SET_IMM_REGW r31,r30,LBLAWAR1_OFF,0
#endif
+
#ifdef LBLAWBAR2_VAL
SET_IMM_REGW r31,r30,LBLAWBAR2_OFF,LBLAWBAR2_VAL
#endif