CONFIG_MONITOR_IS_IN_RAM is broken for MCF532x (and all other processors having RAM located above the FLASH area). This patch fixes this by conditionally - removing the vector table at the beginning of code (MCF532x) - not overwriting the vector base register (MCF532x) - removing the code to re-set the PLL, which effectively disables SDRAM access (MCF532x) - fixing the preprocessor condition to switch monitor protection off (all architectures)
Signed-off-by: Wolfgang Wegner w.wegner@astro-kom.de --- This revised version fixes the too long line in drivers/mtd/cfi_flash.c that would have been introduced by the first version. In case it is preferred to provide a "patch for the patch" to fix the long line alone, please let me know.
cpu/mcf532x/speed.c | 3 +++ cpu/mcf532x/start.S | 4 ++++ drivers/mtd/cfi_flash.c | 3 ++- 3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/cpu/mcf532x/speed.c b/cpu/mcf532x/speed.c index 0d378e6..67f08c7 100644 --- a/cpu/mcf532x/speed.c +++ b/cpu/mcf532x/speed.c @@ -204,6 +204,8 @@ int clock_pll(int fsys, int flags) fout = ((fref * mfd) / (BUSDIV * 4)); #endif
+/* must not tamper with SDRAMC if running from SDRAM */ +#if !defined(CONFIG_MONITOR_IS_IN_RAM) /* * Check to see if the SDRAM has already been initialized. * If it has then the SDRAM needs to be put into self refresh @@ -254,6 +256,7 @@ int clock_pll(int fsys, int flags)
/* wait for DQS logic to relock */ for (i = 0; i < 0x200; i++) ; +#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */
return fout; } diff --git a/cpu/mcf532x/start.S b/cpu/mcf532x/start.S index ff13a9f..5b134aa 100644 --- a/cpu/mcf532x/start.S +++ b/cpu/mcf532x/start.S @@ -45,6 +45,7 @@ addl #60,%sp; /* space for 15 regs */ \ rte;
+#if !defined(CONFIG_MONITOR_IS_IN_RAM) .text /* * Vector table. This is used for initial platform startup. @@ -121,6 +122,7 @@ vector192_255: .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT +#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */
.text
@@ -130,9 +132,11 @@ _start: nop move.w #0x2700,%sr /* Mask off Interrupt */
+#if !defined(CONFIG_MONITOR_IS_IN_RAM) /* Set vector base register at the beginning of the Flash */ move.l #CONFIG_SYS_FLASH_BASE, %d0 movec %d0, %VBR +#endif
move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0 movec %d0, %RAMBAR1 diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 24eb33f..fdba297 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1980,7 +1980,8 @@ unsigned long flash_init (void) }
/* Monitor protection ON by default */ -#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) +#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) && \ + (!defined(CONFIG_MONITOR_IS_IN_RAM)) flash_protect (FLAG_PROTECT_SET, CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,