Patchwork [U-Boot] coldfire: eb_cpu5282: fix: boot from internal flash

login
register
mail settings
Submitter esw@bus-elektronik.de
Date Nov. 20, 2012, 12:06 p.m.
Message ID <1353413185-4365-1-git-send-email-esw@bus-elektronik.de>
Download mbox | patch
Permalink /patch/200310/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

esw@bus-elektronik.de - Nov. 20, 2012, 12:06 p.m.
From: "Jens Scharsig (BuS Elektronik)" <esw@bus-elektronik.de>

* By a sequence of unfavorable conditions in the config header file, the eb_cpu5282
  booting from  internal stopped after relocation. Blame it is a faulty value of
  CONFIG_SYS_MONITOR_BASE. This patch fix this by replace the wrong condition in
  config header with option in board.cfg

Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
---
 boards.cfg                   |    4 ++--
 include/configs/eb_cpu5282.h |    8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)
Tom Rini - Dec. 19, 2012, 10:59 p.m.
On Tue, Nov 20, 2012 at 02:06:25AM -0000, esw@bus-elektronik.de wrote:

> From: "Jens Scharsig (BuS Elektronik)" <esw@bus-elektronik.de>
> 
> * By a sequence of unfavorable conditions in the config header file, the eb_cpu5282
>   booting from  internal stopped after relocation. Blame it is a faulty value of
>   CONFIG_SYS_MONITOR_BASE. This patch fix this by replace the wrong condition in
>   config header with option in board.cfg
> 
> Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>

Applied to u-boot/master, thanks!

Patch

diff --git a/boards.cfg b/boards.cfg
index 7ae663c..2e08a34 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -372,8 +372,8 @@  M5235EVB                     m68k        mcf523x     m5235evb            freesca
 M5235EVB_Flash32             m68k        mcf523x     m5235evb            freescale      -           M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000
 cobra5272                    m68k        mcf52x2     cobra5272           -
 idmr                         m68k        mcf52x2
-eb_cpu5282                   m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xFF000000
-eb_cpu5282_internal          m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xF0000000
+eb_cpu5282                   m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400
+eb_cpu5282_internal          m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418
 TASREG                       m68k        mcf52x2     tasreg              esd
 M5208EVBE                    m68k        mcf52x2     m5208evbe           freescale
 M5249EVB                     m68k        mcf52x2     m5249evb            freescale
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 5a0d321..459f568 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -168,14 +168,6 @@ 
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_SDRAM_BASE0
 #define	CONFIG_SYS_SDRAM_SIZE		CONFIG_SYS_SDRAM_SIZE0
 
-/* If M5282 port is fully implemented the monitor base will be behind
- * the vector table. */
-#if (CONFIG_SYS_TEXT_BASE !=  CONFIG_SYS_INT_FLASH_BASE)
-#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_TEXT_BASE + 0x400)
-#else
-#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */
-#endif
-
 #define CONFIG_SYS_MONITOR_LEN		0x20000
 #define CONFIG_SYS_MALLOC_LEN		(256 << 10)
 #define CONFIG_SYS_BOOTPARAMS_LEN	64*1024