diff options
| author | Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de> | 2012-11-20 02:06:25 +0000 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-19 15:51:58 -0700 | 
| commit | 46dc5bcade4e6d26dfe44baf644c8dca70717917 (patch) | |
| tree | 655f251244ca82e5c10a10810fc45f3034ebb19d | |
| parent | 92ace272d06cec1d7f1533bb9edf914fb5845fba (diff) | |
| download | olio-uboot-2014.01-46dc5bcade4e6d26dfe44baf644c8dca70717917.tar.xz olio-uboot-2014.01-46dc5bcade4e6d26dfe44baf644c8dca70717917.zip | |
coldfire: eb_cpu5282: fix: boot from internal flash
* 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>
| -rw-r--r-- | boards.cfg | 4 | ||||
| -rw-r--r-- | include/configs/eb_cpu5282.h | 8 | 
2 files changed, 2 insertions, 10 deletions
| diff --git a/boards.cfg b/boards.cfg index 35f38f31d..a7cdf6cd1 100644 --- a/boards.cfg +++ b/boards.cfg @@ -373,8 +373,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 5a0d321f7..459f56878 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 |