Re: [PATCH v2] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values

Pali Rohár
2022-06-16T09:30:31Z

On Thursday 16 June 2022 16:57:42 Peng Fan (OSS) wrote:
> 在 2022/4/25 20:29, Pali Rohár 写道:
> > Currently CONFIG_SPL_TEXT_BASE and CONFIG_SYS_TEXT_BASE addresses are
> > manually increased by 0x1000 due to .bootpg section. This section has size
> > of 0x1000 bytes and is manually put by linker script before .text section
> > (and therefore before base address) when CONFIG_SYS_MPC85XX_NO_RESETVEC is
> > set. Due to this fact lot of other config options are manually increased by
> > 0x1000 value to make correct layout. Note that entry point is not on
> > CONFIG_SPL_TEXT_BASE (image+0x1000) but it is really on address
> > CONFIG_SPL_TEXT_BASE-0x1000 (means at the start of the image).
> >
> > Cleanup handling of .bootpg section when CONFIG_SYS_MPC85XX_NO_RESETVEC is
> > set. Put .bootpg code directly into .text section and move text base
> > address to the start of .bootpg code. And finally remove +0x1000 value from
> > lot of config options. With this removal custom PHDRS is not used anymore,
> > so remove it too.
> >
> > After this change entry point would be at CONFIG_SPL_TEXT_BASE and not at
> > address -0x1000 anymore.
> >
> > Tested on P2020 board with SPL and proper U-Boot.
> >
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> > ---
> > Changes in v2:
> > * Rebased on top of the U-Boot master branch, commit 9bb99fa95826d1a608737ca821977b4136a1a278
>
> Please rebase on next branch, I am collecting patches based on Tom's next
> branch.
> Your patch not apply.

Hey, I'm really angry now. I rebased all patches and tested patches
immediately when you asked, I pinged more times about state:
https://lore.kernel.org/u-boot/20220604130148.d3b67mz32fb5nbkp@pali/
There was absolutely no answer even after more reminders and now there
is just again request for rebasing.

> Thanks,
> Peng.
> > ---
> > arch/powerpc/cpu/mpc85xx/start.S | 4 ++--
> > arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 15 +++---------
> > arch/powerpc/cpu/mpc85xx/u-boot.lds | 24 ++++++--------------
> > configs/P1010RDB-PA_36BIT_NAND_defconfig | 6 ++---
> > configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 4 ++--
> > configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 4 ++--
> > configs/P1010RDB-PA_NAND_defconfig | 6 ++---
> > configs/P1010RDB-PA_SDCARD_defconfig | 4 ++--
> > configs/P1010RDB-PA_SPIFLASH_defconfig | 4 ++--
> > configs/P1010RDB-PB_36BIT_NAND_defconfig | 6 ++---
> > configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 4 ++--
> > configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 4 ++--
> > configs/P1010RDB-PB_NAND_defconfig | 6 ++---
> > configs/P1010RDB-PB_SDCARD_defconfig | 4 ++--
> > configs/P1010RDB-PB_SPIFLASH_defconfig | 4 ++--
> > configs/P1020RDB-PC_36BIT_NAND_defconfig | 6 ++---
> > configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 6 ++---
> > configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 6 ++---
> > configs/P1020RDB-PC_NAND_defconfig | 6 ++---
> > configs/P1020RDB-PC_SDCARD_defconfig | 6 ++---
> > configs/P1020RDB-PC_SPIFLASH_defconfig | 6 ++---
> > configs/P1020RDB-PD_NAND_defconfig | 6 ++---
> > configs/P1020RDB-PD_SDCARD_defconfig | 6 ++---
> > configs/P1020RDB-PD_SPIFLASH_defconfig | 6 ++---
> > configs/P2020RDB-PC_36BIT_NAND_defconfig | 6 ++---
> > configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 6 ++---
> > configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 6 ++---
> > configs/P2020RDB-PC_NAND_defconfig | 6 ++---
> > configs/P2020RDB-PC_SDCARD_defconfig | 6 ++---
> > configs/P2020RDB-PC_SPIFLASH_defconfig | 6 ++---
> > configs/T1024RDB_NAND_defconfig | 2 +-
> > configs/T1024RDB_SDCARD_defconfig | 2 +-
> > configs/T1024RDB_SPIFLASH_defconfig | 2 +-
> > configs/T1042D4RDB_NAND_defconfig | 2 +-
> > configs/T1042D4RDB_SDCARD_defconfig | 2 +-
> > configs/T1042D4RDB_SPIFLASH_defconfig | 2 +-
> > configs/T2080QDS_NAND_defconfig | 2 +-
> > configs/T2080QDS_SDCARD_defconfig | 2 +-
> > configs/T2080QDS_SPIFLASH_defconfig | 2 +-
> > configs/T2080RDB_NAND_defconfig | 2 +-
> > configs/T2080RDB_SDCARD_defconfig | 2 +-
> > configs/T2080RDB_SPIFLASH_defconfig | 2 +-
> > configs/T2080RDB_revD_NAND_defconfig | 2 +-
> > configs/T2080RDB_revD_SDCARD_defconfig | 2 +-
> > configs/T2080RDB_revD_SPIFLASH_defconfig | 2 +-
> > configs/T4240RDB_SDCARD_defconfig | 2 +-
> > configs/qemu-ppce500_defconfig | 4 ++--
> > include/configs/P1010RDB.h | 4 ++--
> > include/configs/p1_p2_rdb_pc.h | 4 ++--
> > 49 files changed, 107 insertions(+), 126 deletions(-)
> >
> > diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
> > index 9ddd37111906..e2e9ab4d9005 100644
> > --- a/arch/powerpc/cpu/mpc85xx/start.S
> > +++ b/arch/powerpc/cpu/mpc85xx/start.S
> > @@ -1128,7 +1128,7 @@ switch_as:
> > /*--------------------------------------------------------------*/
> > lis r3,CONFIG_VAL(SYS_MONITOR_BASE)@h
> > ori r3,r3,CONFIG_VAL(SYS_MONITOR_BASE)@l
> > - addi r3,r3,_start_cont - _start
> > + addi r3,r3,_start_cont - CONFIG_VAL(SYS_MONITOR_BASE)
> > mtlr r3
> > blr
> > #endif
> > @@ -1604,7 +1604,7 @@ relocate_code:
> > * initialization, now running from RAM.
> > */
> > - addi r0,r10,in_ram - _start
> > + addi r0,r10,in_ram - CONFIG_VAL(SYS_MONITOR_BASE)
> > /*
> > * As IVPR is going to point RAM address,
> > diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
> > index 1b4d1e05a4a3..6fd0da9f39b1 100644
> > --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
> > +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
> > @@ -9,24 +9,15 @@
> > #include "config.h"
> > OUTPUT_ARCH(powerpc)
> > -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
> > -PHDRS
> > -{
> > - text PT_LOAD;
> > - bss PT_LOAD;
> > -}
> > -#endif
> > +
> > SECTIONS
> > {
> > + . = IMAGE_TEXT_BASE;
> > + .text : {
> > /* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */
> > #ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
> > - .bootpg IMAGE_TEXT_BASE - 0x1000 :
> > - {
> > KEEP(*(.bootpg))
> > - } :text = 0xffff
> > #endif
> > - . = IMAGE_TEXT_BASE;
> > - .text : {
> > *(.text*)
> > }
> > _etext = .;
> > diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
> > index 67b8efdc3043..9794044b3286 100644
> > --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
> > +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
> > @@ -14,32 +14,22 @@
> > OUTPUT_ARCH(powerpc)
> > ENTRY(_start_e500)
> > -PHDRS
> > -{
> > - text PT_LOAD;
> > - bss PT_LOAD;
> > -}
> > -
> > SECTIONS
> > {
> > /* Read-only sections, merged into text segment: */
> > -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
> > - .bootpg CONFIG_SYS_TEXT_BASE - 0x1000 :
> > + .text :
> > {
> > +#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
> > KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
> > - } :text = 0xffff
> > - . = CONFIG_SYS_TEXT_BASE;
> > #endif
> > - .text :
> > - {
> > *(.text*)
> > - } :text
> > + }
> > _etext = .;
> > PROVIDE (etext = .);
> > .rodata :
> > {
> > *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
> > - } :text
> > + }
> > /* Read-write section, merged into data segment: */
> > . = (. + 0x00FF) & 0xFFFFFF00;
> > @@ -88,12 +78,12 @@ SECTIONS
> > .bootpg RESET_VECTOR_ADDRESS - 0xffc :
> > {
> > arch/powerpc/cpu/mpc85xx/start.o (.bootpg)
> > - } :text = 0xffff
> > + } = 0xffff
> > .resetvec RESET_VECTOR_ADDRESS :
> > {
> > KEEP(*(.resetvec))
> > - } :text = 0xffff
> > + } = 0xffff
> > . = RESET_VECTOR_ADDRESS + 0x4;
> > @@ -115,7 +105,7 @@ SECTIONS
> > *(.sbss*)
> > *(.bss*)
> > *(COMMON)
> > - } :bss
> > + }
> > . = ALIGN(4);
> > __bss_end = . ;
> > diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
> > index de67892a4567..ad6f24239361 100644
> > --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
> > +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xD0001000
> > +CONFIG_TPL_TEXT_BASE=0xD0000000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -22,7 +22,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
> > diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> > index 516198b96347..7156f5f6f63d 100644
> > --- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> > +++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> > index a545cffe4d92..ee5b0f4b4e48 100644
> > --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> > +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > CONFIG_SPL=y
> > diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
> > index c980adffffc3..86181bb3636a 100644
> > --- a/configs/P1010RDB-PA_NAND_defconfig
> > +++ b/configs/P1010RDB-PA_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xD0001000
> > +CONFIG_TPL_TEXT_BASE=0xD0000000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -21,7 +21,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
> > diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
> > index 160f4a0dfdeb..7e72653da161 100644
> > --- a/configs/P1010RDB-PA_SDCARD_defconfig
> > +++ b/configs/P1010RDB-PA_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
> > index cf61ca3b9228..f790bd47d8b0 100644
> > --- a/configs/P1010RDB-PA_SPIFLASH_defconfig
> > +++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > CONFIG_SPL=y
> > diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
> > index ac56d416670e..318b849be260 100644
> > --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
> > +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb_36b"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xD0001000
> > +CONFIG_TPL_TEXT_BASE=0xD0000000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -22,7 +22,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
> > diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> > index 2774a5c5c448..c53d75bad52d 100644
> > --- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> > +++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb_36b"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> > index 240aa3a4c2e8..c986b06aae1d 100644
> > --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> > +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb_36b"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > CONFIG_SPL=y
> > diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
> > index 0954e76bb80e..3e4d3c495cc4 100644
> > --- a/configs/P1010RDB-PB_NAND_defconfig
> > +++ b/configs/P1010RDB-PB_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xD0001000
> > +CONFIG_TPL_TEXT_BASE=0xD0000000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -21,7 +21,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
> > diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
> > index 4ad9633bf603..1d08e35371c9 100644
> > --- a/configs/P1010RDB-PB_SDCARD_defconfig
> > +++ b/configs/P1010RDB-PB_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
> > index 9b05f4846823..55300dc37e4a 100644
> > --- a/configs/P1010RDB-PB_SPIFLASH_defconfig
> > +++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb"
> > -CONFIG_SPL_TEXT_BASE=0xD0001000
> > +CONFIG_SPL_TEXT_BASE=0xD0000000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL_DRIVERS_MISC=y
> > CONFIG_SPL=y
> > diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
> > index f739ca0977f6..8e54318ea29f 100644
> > --- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
> > +++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc_36b"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xF8F81000
> > +CONFIG_TPL_TEXT_BASE=0xF8F80000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -23,7 +23,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> > index 4407a02a7d97..ee21d7c28e0a 100644
> > --- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> > +++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc_36b"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > @@ -20,7 +20,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> > index ee0fdd6657d1..246f65c46cd2 100644
> > --- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> > +++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc_36b"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > CONFIG_SPL_SPI_FLASH_SUPPORT=y
> > @@ -22,7 +22,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_SPIFLASH=y
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
> > index be29f9eac4fc..fb6b5d0ad743 100644
> > --- a/configs/P1020RDB-PC_NAND_defconfig
> > +++ b/configs/P1020RDB-PC_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xF8F81000
> > +CONFIG_TPL_TEXT_BASE=0xF8F80000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -22,7 +22,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
> > index feb00ea91615..bbf40382b165 100644
> > --- a/configs/P1020RDB-PC_SDCARD_defconfig
> > +++ b/configs/P1020RDB-PC_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > @@ -19,7 +19,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
> > index f18f4b2ce150..bf666fd50748 100644
> > --- a/configs/P1020RDB-PC_SPIFLASH_defconfig
> > +++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > CONFIG_SPL_SPI_FLASH_SUPPORT=y
> > @@ -21,7 +21,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_SPIFLASH=y
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
> > index 38e5633f82ce..5951be073605 100644
> > --- a/configs/P1020RDB-PD_NAND_defconfig
> > +++ b/configs/P1020RDB-PD_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x20000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xF8F81000
> > +CONFIG_TPL_TEXT_BASE=0xF8F80000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -22,7 +22,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
> > index b50dfcbc392c..ff98e0fbbd02 100644
> > --- a/configs/P1020RDB-PD_SDCARD_defconfig
> > +++ b/configs/P1020RDB-PD_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > @@ -19,7 +19,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
> > index 6649f5b2feaf..0d2ed25de201 100644
> > --- a/configs/P1020RDB-PD_SPIFLASH_defconfig
> > +++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > CONFIG_SPL_SPI_FLASH_SUPPORT=y
> > @@ -21,7 +21,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_SPIFLASH=y
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
> > index 905b1edc2b23..b2c30b5abfd0 100644
> > --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
> > +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc_36b"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xF8F81000
> > +CONFIG_TPL_TEXT_BASE=0xF8F80000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -23,7 +23,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> > index 1e15552edc70..aef18fba5ab8 100644
> > --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> > +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc_36b"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > @@ -20,7 +20,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> > index cf0ae5da3cfa..8db795fd1de3 100644
> > --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> > +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc_36b"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > CONFIG_SPL_SPI_FLASH_SUPPORT=y
> > @@ -22,7 +22,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_SPIFLASH=y
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
> > index 5b140525f025..6f39ad80cfdc 100644
> > --- a/configs/P2020RDB-PC_NAND_defconfig
> > +++ b/configs/P2020RDB-PC_NAND_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_ENV_SIZE=0x4000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc"
> > CONFIG_SPL_TEXT_BASE=0xFF800000
> > CONFIG_SPL_SERIAL=y
> > -CONFIG_TPL_TEXT_BASE=0xF8F81000
> > +CONFIG_TPL_TEXT_BASE=0xF8F80000
> > CONFIG_TPL_LIBCOMMON_SUPPORT=y
> > CONFIG_TPL_LIBGENERIC_SUPPORT=y
> > CONFIG_TPL_SERIAL=y
> > @@ -22,7 +22,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
> > index 540999bef21d..63f6a64a8a70 100644
> > --- a/configs/P2020RDB-PC_SDCARD_defconfig
> > +++ b/configs/P2020RDB-PC_SDCARD_defconfig
> > @@ -1,13 +1,13 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x0
> > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_MMC=y
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > @@ -19,7 +19,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
> > diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
> > index 0881e35476ac..e62d9cff3116 100644
> > --- a/configs/P2020RDB-PC_SPIFLASH_defconfig
> > +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
> > @@ -1,6 +1,6 @@
> > CONFIG_PPC=y
> > CONFIG_SYS_IMMR=0xFFE00000
> > -CONFIG_SYS_TEXT_BASE=0x11001000
> > +CONFIG_SYS_TEXT_BASE=0x11000000
> > CONFIG_SYS_MALLOC_LEN=0x100000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
> > CONFIG_ENV_OFFSET=0x100000
> > CONFIG_ENV_SECT_SIZE=0x10000
> > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc"
> > -CONFIG_SPL_TEXT_BASE=0xf8f81000
> > +CONFIG_SPL_TEXT_BASE=0xf8f80000
> > CONFIG_SPL_SERIAL=y
> > CONFIG_SPL=y
> > CONFIG_SPL_SPI_FLASH_SUPPORT=y
> > @@ -21,7 +21,7 @@ CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_BOARD_SETUP=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000
> > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000
> > CONFIG_SPIFLASH=y
> > CONFIG_BOOTDELAY=10
> > CONFIG_USE_BOOTCOMMAND=y
> > diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
> > index a5d80c9857bb..f794c9e2ef2b 100644
> > --- a/configs/T1024RDB_NAND_defconfig
> > +++ b/configs/T1024RDB_NAND_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x30001000
> > +CONFIG_SYS_TEXT_BASE=0x30000000
> > CONFIG_SYS_MALLOC_LEN=0xa00000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
> > index a820d2969e35..96fb2d9f982b 100644
> > --- a/configs/T1024RDB_SDCARD_defconfig
> > +++ b/configs/T1024RDB_SDCARD_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x30001000
> > +CONFIG_SYS_TEXT_BASE=0x30000000
> > CONFIG_SYS_MALLOC_LEN=0xa00000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
> > index 2708e9f0911f..1b60ed1dd305 100644
> > --- a/configs/T1024RDB_SPIFLASH_defconfig
> > +++ b/configs/T1024RDB_SPIFLASH_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x30001000
> > +CONFIG_SYS_TEXT_BASE=0x30000000
> > CONFIG_SYS_MALLOC_LEN=0xa00000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
> > index 1ec838aaa0f8..0f24f86d0cc6 100644
> > --- a/configs/T1042D4RDB_NAND_defconfig
> > +++ b/configs/T1042D4RDB_NAND_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x30001000
> > +CONFIG_SYS_TEXT_BASE=0x30000000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
> > index 3cb72f03d6b0..6a6145cbb679 100644
> > --- a/configs/T1042D4RDB_SDCARD_defconfig
> > +++ b/configs/T1042D4RDB_SDCARD_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x30001000
> > +CONFIG_SYS_TEXT_BASE=0x30000000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
> > index 662c93691d1d..4e5b82def313 100644
> > --- a/configs/T1042D4RDB_SPIFLASH_defconfig
> > +++ b/configs/T1042D4RDB_SPIFLASH_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x30001000
> > +CONFIG_SYS_TEXT_BASE=0x30000000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
> > index 4721795c5eb5..0867c85c14f8 100644
> > --- a/configs/T2080QDS_NAND_defconfig
> > +++ b/configs/T2080QDS_NAND_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
> > index d440ab69a685..02f34dcd500d 100644
> > --- a/configs/T2080QDS_SDCARD_defconfig
> > +++ b/configs/T2080QDS_SDCARD_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
> > index f3ae31bf2224..75d030307ba3 100644
> > --- a/configs/T2080QDS_SPIFLASH_defconfig
> > +++ b/configs/T2080QDS_SPIFLASH_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
> > index bef6fe8f59af..c2b86d1e331d 100644
> > --- a/configs/T2080RDB_NAND_defconfig
> > +++ b/configs/T2080RDB_NAND_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
> > index f6668720cf3a..ebf0a20eae32 100644
> > --- a/configs/T2080RDB_SDCARD_defconfig
> > +++ b/configs/T2080RDB_SDCARD_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
> > index 2578b0eabb88..913686480182 100644
> > --- a/configs/T2080RDB_SPIFLASH_defconfig
> > +++ b/configs/T2080RDB_SPIFLASH_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig
> > index 10f7e2cd18ba..2711b99a1039 100644
> > --- a/configs/T2080RDB_revD_NAND_defconfig
> > +++ b/configs/T2080RDB_revD_NAND_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080RDB_revD_SDCARD_defconfig b/configs/T2080RDB_revD_SDCARD_defconfig
> > index 9951efbb3d50..01273313d368 100644
> > --- a/configs/T2080RDB_revD_SDCARD_defconfig
> > +++ b/configs/T2080RDB_revD_SDCARD_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig
> > index 59f67d88a024..1b196e0945f1 100644
> > --- a/configs/T2080RDB_revD_SPIFLASH_defconfig
> > +++ b/configs/T2080RDB_revD_SPIFLASH_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
> > index 43354c0af2b7..7d2e1841c378 100644
> > --- a/configs/T4240RDB_SDCARD_defconfig
> > +++ b/configs/T4240RDB_SDCARD_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0x00201000
> > +CONFIG_SYS_TEXT_BASE=0x00200000
> > CONFIG_SPL_LIBCOMMON_SUPPORT=y
> > CONFIG_SPL_LIBGENERIC_SUPPORT=y
> > CONFIG_ENV_SIZE=0x2000
> > diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
> > index eac2cc2854db..4aae686335b0 100644
> > --- a/configs/qemu-ppce500_defconfig
> > +++ b/configs/qemu-ppce500_defconfig
> > @@ -1,5 +1,5 @@
> > CONFIG_PPC=y
> > -CONFIG_SYS_TEXT_BASE=0xf01000
> > +CONFIG_SYS_TEXT_BASE=0xf00000
> > CONFIG_ENV_SIZE=0x2000
> > CONFIG_DEFAULT_DEVICE_TREE="qemu-ppce500"
> > CONFIG_SYS_CLK_FREQ=33000000
> > @@ -9,7 +9,7 @@ CONFIG_TARGET_QEMU_PPCE500=y
> > CONFIG_FIT=y
> > CONFIG_FIT_VERBOSE=y
> > CONFIG_OF_STDOUT_VIA_ALIAS=y
> > -CONFIG_SYS_MONITOR_BASE=0x00F01000
> > +CONFIG_SYS_MONITOR_BASE=0x00F00000
> > CONFIG_BOOTDELAY=1
> > CONFIG_USE_BOOTCOMMAND=y
> > CONFIG_BOOTCOMMAND="test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdtcontroladdr"
> > diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
> > index 0d8f13eeb065..40a5afd2d8c6 100644
> > --- a/include/configs/P1010RDB.h
> > +++ b/include/configs/P1010RDB.h
> > @@ -420,7 +420,7 @@ extern unsigned long get_sdram_size(void);
> > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR
> > #define CONFIG_SYS_L2_SIZE (256 << 10)
> > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
> > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xD0001000
> > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE
> > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024)
> > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 128 * 1024)
> > #define CONFIG_SPL_RELOC_MALLOC_SIZE (128 << 10)
> > @@ -431,7 +431,7 @@ extern unsigned long get_sdram_size(void);
> > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR
> > #define CONFIG_SYS_L2_SIZE (256 << 10)
> > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
> > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xD0001000
> > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE
> > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 192 * 1024)
> > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 208 * 1024)
> > #define CONFIG_SPL_RELOC_MALLOC_SIZE (48 << 10)
> > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
> > index 17b9021fbf86..7d03d888f21f 100644
> > --- a/include/configs/p1_p2_rdb_pc.h
> > +++ b/include/configs/p1_p2_rdb_pc.h
> > @@ -347,7 +347,7 @@
> > #define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000
> > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR
> > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
> > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xf8f81000
> > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE
> > #define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024)
> > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024)
> > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024)
> > @@ -361,7 +361,7 @@
> > #define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000
> > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR
> > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
> > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xf8f81000
> > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE
> > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 192 * 1024)
> > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 208 * 1024)
> > #define CONFIG_SPL_RELOC_MALLOC_SIZE (48 << 10)
>