powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC
PATCH v3 1/1 powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC
Some systems need to relocate the env_addr pointer early because the location it points to will get invalidated before env_relocate is called. One example is on systems that might use a L2 or L3 cache in SRAM mode and initialize that cache from SRAM mode back to being a cache in cpu_init_r.
We set this on the 85xx boards that have support for NAND, SPI, or SDHC/MMC boot support as they use a secondary cache in SRAM mode and need the env_addr pointer relocated since we change from SRAM to normal cache mode in cpu_init_r.
Also removed CONFIG_SYS_SPL as its not used anywhere.
---
* Removed CONFIG_SYS_SPL as its not used anywhere
arch/powerpc/lib/board.c | 11 +++++++++++ include/configs/MPC8536DS.h | 5 +++-- include/configs/MPC8569MDS.h | 3 ++- include/configs/P1_P2_RDB.h | 5 +++-- 4 files changed, 19 insertions(+), 5 deletions(-)
arch/powerpc/lib/board.c +11 -0
@@ -645,6 +645,17 @@ void board_init_r (gd_t *id, ulong dest_addr) gd->cpu += dest_addr -CONFIG_SYS_MONITOR_BASE ;#endif +#ifdef CONFIG_SYS_EXTRA_ENV_RELOC +/* +* Some systems need to relocate the env_addr pointer early because the +* location it points to will get invalidated before env_relocate is +* called. One example is on systems that might use a L2 or L3 cache +* in SRAM mode and initialize that cache from SRAM mode back to being +* a cache in cpu_init_r. +*/ + gd->env_addr += dest_addr -CONFIG_SYS_MONITOR_BASE ; +#endif +#ifdef CONFIG_SERIAL_MULTI serial_initialize ();#endif
include/configs/MPC8536DS.h +3 -2
@@ -242,9 +242,10 @@#define CONFIG_SYS_FLASH_ERASE_TOUT 60000/* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* Flash Write Timeout (ms) */ -#if defined(CONFIG_SYS_SPL ) || defined(CONFIG_RAMBOOT_NAND ) \ - || defined(CONFIG_RAMBOOT_SDCARD ) || defined(CONFIG_RAMBOOT_SPIFLASH ) +#if defined(CONFIG_RAMBOOT_NAND ) || defined(CONFIG_RAMBOOT_SDCARD ) || \ + defined(CONFIG_RAMBOOT_SPIFLASH )#define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT#endif
include/configs/MPC8569MDS.h +2 -1
@@ -203,8 +203,9 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_FLASH_ERASE_TOUT 60000/* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* Flash Write Timeout (ms) */ -#if defined(CONFIG_SYS_SPL ) || defined(CONFIG_RAMBOOT_NAND ) +#if defined(CONFIG_RAMBOOT_NAND )#define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT#endif
include/configs/P1_P2_RDB.h +3 -2
@@ -201,9 +201,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_FLASH_ERASE_TOUT 60000/* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* Flash Write Timeout (ms) */ -#if defined(CONFIG_SYS_SPL ) || defined(CONFIG_RAMBOOT_NAND ) \ - || defined(CONFIG_RAMBOOT_SDCARD ) || defined(CONFIG_RAMBOOT_SPIFLASH ) +#if defined(CONFIG_RAMBOOT_NAND ) || defined(CONFIG_RAMBOOT_SDCARD ) || \ + defined(CONFIG_RAMBOOT_SPIFLASH )#define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC #else #undef CONFIG_SYS_RAMBOOT#endif
Signature · 1 line
1.7.2.3
Wolfgang Denk
AppliedPATCH v3 1/1 powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC
Dear Kumar Gala,
Quoted 14 lines · In message <[email protected]> you…
Some systems need to relocate the
env_addrpointer early because the location it points to will get invalidated beforeenv_relocateis called. One example is on systems that might use a L2 or L3 cache in SRAM mode and initialize that cache from SRAM mode back to being a cache incpu_init_r.We set this on the 85xx boards that have support for NAND, SPI, or SDHC/MMC boot support as they use a secondary cache in SRAM mode and need the
env_addrpointer relocated since we change from SRAM to normal cache mode incpu_init_r.Also removed
CONFIG_SYS_SPLas its not used anywhere.Signed-off-by Kumar Gala <[email protected]>
Quoted 8 lines
---
* RemovedCONFIG_SYS_SPLas its not used anywherearch/powerpc/lib/board.c | 11 +++++++++++ include/configs/MPC8536DS.h | 5 +++-- include/configs/MPC8569MDS.h | 3 ++- include/configs/P1_P2_RDB.h | 5 +++-- 4 files changed, 19 insertions(+), 5 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de As of 1992, they're called European Economic Community fries.