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

Pali Rohár
2022-06-23T11:29:25Z

On Thursday 16 June 2022 14:19:44 Pali Rohár wrote:
> 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>
> ---

PING???

> Changes in v3:
> * Rebased on top of the U-Boot next branch, commit a87a6fcd20c0e29fe55bfbb6917c4aa1f1bbce74
>
> Changes in v2:
> * Rebased on top of the U-Boot master branch, commit 9bb99fa95826d1a608737ca821977b4136a1a278
> ---
> 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 | 8 +++----
> configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 6 ++---
> configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 6 ++---
> configs/P1010RDB-PA_NAND_defconfig | 8 +++----
> configs/P1010RDB-PA_SDCARD_defconfig | 6 ++---
> configs/P1010RDB-PA_SPIFLASH_defconfig | 6 ++---
> configs/P1010RDB-PB_36BIT_NAND_defconfig | 8 +++----
> configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 6 ++---
> configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 6 ++---
> configs/P1010RDB-PB_NAND_defconfig | 8 +++----
> configs/P1010RDB-PB_SDCARD_defconfig | 6 ++---
> configs/P1010RDB-PB_SPIFLASH_defconfig | 6 ++---
> configs/P1020RDB-PC_36BIT_NAND_defconfig | 8 +++----
> configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 6 ++---
> configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 6 ++---
> configs/P1020RDB-PC_NAND_defconfig | 8 +++----
> configs/P1020RDB-PC_SDCARD_defconfig | 6 ++---
> configs/P1020RDB-PC_SPIFLASH_defconfig | 6 ++---
> configs/P1020RDB-PD_NAND_defconfig | 8 +++----
> configs/P1020RDB-PD_SDCARD_defconfig | 6 ++---
> configs/P1020RDB-PD_SPIFLASH_defconfig | 6 ++---
> configs/P2020RDB-PC_36BIT_NAND_defconfig | 8 +++----
> configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 6 ++---
> configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 6 ++---
> configs/P2020RDB-PC_NAND_defconfig | 8 +++----
> 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 ++--
> 47 files changed, 120 insertions(+), 139 deletions(-)
>
> diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
> index 9a28269020dc..5009cbef54a0 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_cont
> + addi r3,r3,_start_cont - CONFIG_VAL(SYS_MONITOR_BASE)
> mtlr r3
> blr
> #endif
> @@ -1600,7 +1600,7 @@ relocate_code:
> * initialization, now running from RAM.
> */
>
> - addi r0,r10,in_ram - _start_cont
> + 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 e1bbee43bcb4..9f422810bb5d 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)
>
> -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 6c4142c200b5..fb980ef64e9e 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
> @@ -20,7 +20,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"
> @@ -36,7 +36,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xd003d000
> CONFIG_SPL_RELOC_STACK=0xd003fff0
> CONFIG_TPL_GD_ADDR=0xd002c000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_TPL_RELOC_STACK=0xd0030000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000
> diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> index 324ad908bb09..5fd5214c762b 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
> @@ -31,7 +31,7 @@ CONFIG_SPL_MMC_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> index 2299f450a972..1b6cf992038e 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
> @@ -34,7 +34,7 @@ CONFIG_SPL_SPI_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
> index 5813c75f10a6..9c21251788d2 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
> @@ -19,7 +19,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"
> @@ -35,7 +35,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xd003d000
> CONFIG_SPL_RELOC_STACK=0xd003fff0
> CONFIG_TPL_GD_ADDR=0xd002c000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_TPL_RELOC_STACK=0xd0030000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000
> diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
> index a51f9acd5861..5466e52f566c 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
> @@ -30,7 +30,7 @@ CONFIG_SPL_MMC_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
> index c2b5d7762ce3..549bdf51d7af 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
> @@ -33,7 +33,7 @@ CONFIG_SPL_SPI_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
> index 4caf43dade2a..4ae2ec582450 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
> @@ -20,7 +20,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"
> @@ -37,7 +37,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xd003d000
> CONFIG_SPL_RELOC_STACK=0xd003fff0
> CONFIG_TPL_GD_ADDR=0xd002c000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_TPL_RELOC_STACK=0xd0030000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000
> diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> index 50053876f8ec..a37a56efb073 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
> @@ -32,7 +32,7 @@ CONFIG_SPL_MMC_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> index 6f0cd359abbf..62a0804f7620 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
> @@ -35,7 +35,7 @@ CONFIG_SPL_SPI_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
> index 16b52196aeb8..1cc7c1c9644d 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
> @@ -19,7 +19,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"
> @@ -36,7 +36,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xd003d000
> CONFIG_SPL_RELOC_STACK=0xd003fff0
> CONFIG_TPL_GD_ADDR=0xd002c000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_TPL_RELOC_STACK=0xd0030000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000
> diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
> index 6d3be4303a28..776c9019ebd3 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
> @@ -31,7 +31,7 @@ CONFIG_SPL_MMC_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
> index a54f7eab5f20..9ef371607050 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
> @@ -34,7 +34,7 @@ CONFIG_SPL_SPI_BOOT=y
> CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
> CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_GD_ADDR=0xd0018000
> -CONFIG_SPL_RELOC_TEXT_BASE=0xd0001000
> +CONFIG_SPL_RELOC_TEXT_BASE=0xd0000000
> CONFIG_SPL_RELOC_STACK=0xd001c000
> CONFIG_SPL_RELOC_MALLOC=y
> CONFIG_SPL_RELOC_MALLOC_ADDR=0xd0020000
> diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
> index 80bfe31d79a5..740d534e2fe8 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
> @@ -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=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"
> @@ -37,7 +37,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xf8fbe000
> CONFIG_SPL_RELOC_STACK=0xf8fbfff0
> CONFIG_TPL_GD_ADDR=0xf8fac000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xf8f81000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xf8f80000
> CONFIG_TPL_RELOC_STACK=0xf8fb0000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000
> diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> index 2619ef0fb17f..d1a48f9a8692 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 e37c74bd1f16..236cb410a395 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 860636292d2f..3901a3557ab1 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
> @@ -20,7 +20,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"
> @@ -36,7 +36,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xf8fbe000
> CONFIG_SPL_RELOC_STACK=0xf8fbfff0
> CONFIG_TPL_GD_ADDR=0xf8fac000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xf8f81000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xf8f80000
> CONFIG_TPL_RELOC_STACK=0xf8fb0000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000
> diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
> index c0d78c9f486d..a08965b00962 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 debd83ed93ed..a70f4f112dff 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 d770fc7ba7ee..3eeb7ea2ed49 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
> @@ -20,7 +20,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"
> @@ -36,7 +36,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xf8fbe000
> CONFIG_SPL_RELOC_STACK=0xf8fbfff0
> CONFIG_TPL_GD_ADDR=0xf8fac000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xf8f81000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xf8f80000
> CONFIG_TPL_RELOC_STACK=0xf8fb0000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000
> diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
> index db484c0d1892..ebd9c84cfca9 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 d9d630761239..5191f4ebc738 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 ac4d4579bb72..6dbdf7c4aba6 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
> @@ -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=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"
> @@ -37,7 +37,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xf8ffe000
> CONFIG_SPL_RELOC_STACK=0xf8fffff0
> CONFIG_TPL_GD_ADDR=0xf8fac000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xf8f81000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xf8f80000
> CONFIG_TPL_RELOC_STACK=0xf8fb0000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000
> diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> index b2a5a72143d3..c54257398fa1 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 42e31b4e22ce..29a30adfe1cb 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 69ca044e5a22..3102a49d5730 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
> @@ -20,7 +20,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"
> @@ -36,7 +36,7 @@ CONFIG_SPL_FLUSH_IMAGE=y
> CONFIG_SPL_RELOC_TEXT_BASE=0xf8ffe000
> CONFIG_SPL_RELOC_STACK=0xf8fffff0
> CONFIG_TPL_GD_ADDR=0xf8fac000
> -CONFIG_TPL_RELOC_TEXT_BASE=0xf8f81000
> +CONFIG_TPL_RELOC_TEXT_BASE=0xf8f80000
> CONFIG_TPL_RELOC_STACK=0xf8fb0000
> CONFIG_TPL_RELOC_MALLOC=y
> CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000
> diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
> index 621e5b035f2c..280df00944bc 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 04b10d36c52a..2da909bb3b73 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 2eb985823ec0..ff5e49678196 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 9daf7fd5ef77..64b1b463d3df 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 ee9292a4fb9f..1f7b658d57bb 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 91a83007ce87..f7f2b16f7e13 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 32fed7a33a4a..1d16947471f1 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 638ed7147a72..114b7463cb19 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 b71659a6600d..34dfeb2dee5a 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 1b8ef0cb365f..3bd5ad0d84a6 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 bcef31a665fc..0ff5a1a3724c 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 9e8e3ea8b5af..83bb1c37c2df 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 b6a0b857a725..79958022ba80 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 b0f0d165cdd2..86725b9a17a0 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 feba8e54b5cb..65beaa916787 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 0495786bc5f9..eb30705011e5 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 bb7c711d5575..bfddca98f815 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 fb35c83f1b6c..142703f29543 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 55444b69a7ad..28a7d18c826f 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"
> --
> 2.20.1
>