[U-Boot] [PATCH 2/2 v2] powerpc/85xx: add CONFIG_SYS_TEXT_BASE_SPL for 85xx nand spl build

[Scott Wood]

On Wed, 10 Nov 2010 15:21:27 -0500
Haiying.Wang at freescale.com wrote:

> From: Haiying Wang <Haiying.Wang at freescale.com>
> 
> Signed-off-by: Haiying Wang <Haiying.Wang at freescale.com>
> ---
> v2 change: remove 8569 CONFIG_MMC change which should not be in this patch.
> 
>  arch/powerpc/cpu/mpc85xx/start.S             |   12 ++++++++++++
>  include/configs/MPC8536DS.h                  |    8 ++++++--
>  include/configs/MPC8569MDS.h                 |    8 ++++++--
>  include/configs/P1_P2_RDB.h                  |    8 ++++++--
>  nand_spl/board/freescale/mpc8536ds/Makefile  |    4 ++--
>  nand_spl/board/freescale/mpc8569mds/Makefile |    4 ++--
>  nand_spl/board/freescale/p1_p2_rdb/Makefile  |    4 ++--
>  7 files changed, 36 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
> index 291557d..5386be7 100644
> --- a/arch/powerpc/cpu/mpc85xx/start.S
> +++ b/arch/powerpc/cpu/mpc85xx/start.S
> @@ -146,7 +146,11 @@ _start_e500:
>  	beq	2b
>  
>  	/* Setup interrupt vectors */
> +#ifdef CONFIG_NAND_SPL
> +	lis	r1,CONFIG_SYS_TEXT_BASE_SPL at h
> +#else
>  	lis	r1,CONFIG_SYS_TEXT_BASE at h
> +#endif
>  	mtspr	IVPR,r1
>  
>  	li	r1,0x0100
> @@ -306,11 +310,19 @@ _start_e500:
>  	lis     r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@h
>  	ori     r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@l
>  
> +#ifdef CONFIG_NAND_SPL
> +	lis     r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE_SPL, (MAS2_I|MAS2_G))@h
> +	ori     r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE_SPL, (MAS2_I|MAS2_G))@l
> +
> +	lis     r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE_SPL, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
> +	ori     r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE_SPL, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
> +#else
>  	lis     r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, (MAS2_I|MAS2_G))@h
>  	ori     r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, (MAS2_I|MAS2_G))@l
>  
>  	lis     r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
>  	ori     r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
> +#endif /* CONFIG_NAND_SPL */
>  #endif
>  
>  	mtspr   MAS0,r6

We can avoid the ifdef by using CONFIG_SYS_MONITOR_BASE.

-Scott