[U-Boot] powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC

Some systems need to relocate the env_addr pointer early because the
location its point 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.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/lib/board.c     |   11 +++++++++++
 include/configs/MPC8536DS.h  |    1 +
 include/configs/MPC8569MDS.h |    1 +
 include/configs/P1_P2_RDB.h  |    1 +
 4 files changed, 14 insertions(+), 0 deletions(-)

On Nov 18, 2010, at 11:21 AM, Kumar Gala wrote:

> Some systems need to relocate the env_addr pointer early because the
> location its point 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.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/lib/board.c     |   11 +++++++++++
> include/configs/MPC8536DS.h  |    1 +
> include/configs/MPC8569MDS.h |    1 +
> include/configs/P1_P2_RDB.h  |    1 +
> 4 files changed, 14 insertions(+), 0 deletions(-)

Wolfgang,

I dont think either of us are happy with this solution but not really sure what else to do.  Please ack if you're grudgingly ok with this.  :)

- k

On Nov 18, 2010, at 11:21 AM, Kumar Gala wrote:

> Some systems need to relocate the env_addr pointer early because the
> location its point 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.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/lib/board.c     |   11 +++++++++++
> include/configs/MPC8536DS.h  |    1 +
> include/configs/MPC8569MDS.h |    1 +
> include/configs/P1_P2_RDB.h  |    1 +
> 4 files changed, 14 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
> index 2e0749d..ce51c8f 100644
> --- a/arch/powerpc/lib/board.c
> +++ b/arch/powerpc/lib/board.c
> @@ -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 its point to will get invalidated before env_relocate is
^^^^^^^^^^^^^^^^^^^^^^

Not to nitpick, but please correct this - I think you meant "location it points to"?

-B