* [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code
@ 2022-04-05 13:12 Pali Rohár
2022-04-05 13:12 ` [PATCH 1/8] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support Pali Rohár
` (8 more replies)
0 siblings, 9 replies; 39+ messages in thread
From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw)
To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf,
Bin Meng, Wolfgang Denk, Sinan Akman
Cc: u-boot
This patch series fixes support for CONFIG_OF_SEPARATE option, cleanup
linker scripts and change code so TEXT_BASE address is set o expected value.
Tested on P2020 based board.
Pali Rohár (8):
powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support
powerpc: mpc85xx: Remove duplicate u-boot-nand.lds
powerpc: mpc85xx: Remove u-boot-nand_spl.lds
powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld
script
powerpc: mpc85xx: Put bss after image when not including reset vector
powerpc: mpc85xx: Define linker sections in ascending order
powerpc: mpc85xx: Set TEXT_BASE addresses to real base values
board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros
arch/powerpc/cpu/mpc85xx/start.S | 4 +-
arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 97 --------------------
arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 68 --------------
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 25 ++---
arch/powerpc/cpu/mpc85xx/u-boot.lds | 37 +++-----
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 | 4 +-
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +-
configs/P1020RDB-PC_NAND_defconfig | 6 +-
configs/P1020RDB-PC_SDCARD_defconfig | 4 +-
configs/P1020RDB-PC_SPIFLASH_defconfig | 4 +-
configs/P1020RDB-PD_NAND_defconfig | 6 +-
configs/P1020RDB-PD_SDCARD_defconfig | 4 +-
configs/P1020RDB-PD_SPIFLASH_defconfig | 4 +-
configs/P2020RDB-PC_36BIT_NAND_defconfig | 6 +-
configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 4 +-
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +-
configs/P2020RDB-PC_NAND_defconfig | 6 +-
configs/P2020RDB-PC_SDCARD_defconfig | 4 +-
configs/P2020RDB-PC_SPIFLASH_defconfig | 4 +-
configs/T1024RDB_NAND_defconfig | 4 +-
configs/T1024RDB_SDCARD_defconfig | 2 +-
configs/T1024RDB_SPIFLASH_defconfig | 2 +-
configs/T1042D4RDB_NAND_defconfig | 4 +-
configs/T1042D4RDB_SDCARD_defconfig | 2 +-
configs/T1042D4RDB_SPIFLASH_defconfig | 2 +-
configs/T2080QDS_NAND_defconfig | 4 +-
configs/T2080QDS_SDCARD_defconfig | 2 +-
configs/T2080QDS_SPIFLASH_defconfig | 2 +-
configs/T2080RDB_NAND_defconfig | 4 +-
configs/T2080RDB_SDCARD_defconfig | 2 +-
configs/T2080RDB_SPIFLASH_defconfig | 2 +-
configs/T2080RDB_revD_NAND_defconfig | 4 +-
configs/T2080RDB_revD_SDCARD_defconfig | 2 +-
configs/T2080RDB_revD_SPIFLASH_defconfig | 2 +-
configs/T4240RDB_SDCARD_defconfig | 2 +-
configs/qemu-ppce500_defconfig | 2 +-
include/configs/P1010RDB.h | 10 +-
include/configs/T102xRDB.h | 3 +
include/configs/T104xRDB.h | 3 +
include/configs/T208xQDS.h | 3 +
include/configs/T208xRDB.h | 3 +
include/configs/p1_p2_rdb_pc.h | 26 +++---
55 files changed, 127 insertions(+), 322 deletions(-)
delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
--
2.20.1
^ permalink raw reply [flat|nested] 39+ messages in thread* [PATCH 1/8] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-04-08 11:04 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 2/8] powerpc: mpc85xx: Remove duplicate u-boot-nand.lds Pali Rohár ` (7 subsequent siblings) 8 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot Currently CONFIG_OF_SEPARATE is completely broken and U-Boot for some mpc85xx board (e.g. P2020) has to be compiled with CONFIG_OF_EMBED. Otherwise it crashes during early init. When debug console is enabled and all debug logging options are turned on then U-Boot on P2020 with CONFIG_OF_SEPARATE prints following error: No valid device tree binary found at 110dc300 initcall sequence 110d3560 failed at call 1109535c (err=-1) ### ERROR ### Please RESET the board ### Problem is with appended DTB. When CONFIG_SYS_MPC85XX_NO_RESETVEC is set U-Boot binary image without DTB ends immediately after the .u_boot_list section. At this position is defined _end symbol at which U-Boot expects start of the appended DTB. Problem is that after .u_boot_list section are in linker script defined another sections with 256 byte long padding which are completely empty. During conversion of U-Boot ELF binary to RAW binary u-boot-nodtb.bin, objcopy removes trailing zero padding and therefore DTB is appended at wrong position. Changing alignment from 256 bytes to 4 bytes fixes this issue. And appended DTB is finally at he correct position. With this fix U-Boot on P2020 with CONFIG_OF_SEPARATE option starts working again. Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/powerpc/cpu/mpc85xx/u-boot.lds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 17a0e631ca3e..48509dbdae01 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -75,11 +75,11 @@ SECTIONS __ex_table : { *(__ex_table) } __stop___ex_table = .; - . = ALIGN(256); + . = ALIGN(4); __init_begin = .; .text.init : { *(.text.init) } .data.init : { *(.data.init) } - . = ALIGN(256); + . = ALIGN(4); __init_end = .; _end = .; -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [PATCH 1/8] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support 2022-04-05 13:12 ` [PATCH 1/8] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support Pali Rohár @ 2022-04-08 11:04 ` Pali Rohár 0 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-04-08 11:04 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, Simon Glass Cc: u-boot On Tuesday 05 April 2022 15:12:30 Pali Rohár wrote: > Currently CONFIG_OF_SEPARATE is completely broken and U-Boot for some > mpc85xx board (e.g. P2020) has to be compiled with CONFIG_OF_EMBED. > Otherwise it crashes during early init. > > When debug console is enabled and all debug logging options are turned on > then U-Boot on P2020 with CONFIG_OF_SEPARATE prints following error: > > No valid device tree binary found at 110dc300 > initcall sequence 110d3560 failed at call 1109535c (err=-1) > ### ERROR ### Please RESET the board ### > > Problem is with appended DTB. When CONFIG_SYS_MPC85XX_NO_RESETVEC is set > U-Boot binary image without DTB ends immediately after the .u_boot_list > section. At this position is defined _end symbol at which U-Boot expects > start of the appended DTB. > > Problem is that after .u_boot_list section are in linker script defined > another sections with 256 byte long padding which are completely empty. > During conversion of U-Boot ELF binary to RAW binary u-boot-nodtb.bin, > objcopy removes trailing zero padding and therefore DTB is appended at > wrong position. +Simon I'm not sure if this is not rather generic bug in U-Boot build system. objcopy really removes trailing zero padding from the end of file which it creates. And if I'm looking into Makefiles correctly, it just do cat of U-Boot binary and DTB files. So should not build system look into source ELF binary where last section ends and adds necessary padding between U-Boot binary and DTB file? > Changing alignment from 256 bytes to 4 bytes fixes this issue. And appended > DTB is finally at he correct position. With this fix U-Boot on P2020 with > CONFIG_OF_SEPARATE option starts working again. > > Signed-off-by: Pali Rohár <pali@kernel.org> > --- > arch/powerpc/cpu/mpc85xx/u-boot.lds | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds > index 17a0e631ca3e..48509dbdae01 100644 > --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds > +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds > @@ -75,11 +75,11 @@ SECTIONS > __ex_table : { *(__ex_table) } > __stop___ex_table = .; > > - . = ALIGN(256); > + . = ALIGN(4); > __init_begin = .; > .text.init : { *(.text.init) } > .data.init : { *(.data.init) } > - . = ALIGN(256); > + . = ALIGN(4); > __init_end = .; > _end = .; > > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH 2/8] powerpc: mpc85xx: Remove duplicate u-boot-nand.lds 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár 2022-04-05 13:12 ` [PATCH 1/8] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 3/8] powerpc: mpc85xx: Remove u-boot-nand_spl.lds Pali Rohár ` (6 subsequent siblings) 8 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot It looks like that mpc85xx linker script u-boot-nand.lds provides same functionality as default mpc85xx linker script u-boot.lds when config option CONFIG_SYS_MPC85XX_NO_RESETVEC is defined. So adjust include config files for NAND defconfigs to define CONFIG_SYS_MPC85XX_NO_RESETVEC and use default mpc85xx linker script u-boot.lds. And finally remove duplicate u-boot-nand.lds linker script. Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 97 ------------------------ configs/P1010RDB-PA_36BIT_NAND_defconfig | 2 - configs/P1010RDB-PA_NAND_defconfig | 2 - configs/P1010RDB-PB_36BIT_NAND_defconfig | 2 - configs/P1010RDB-PB_NAND_defconfig | 2 - configs/P1020RDB-PC_36BIT_NAND_defconfig | 2 - configs/P1020RDB-PC_NAND_defconfig | 2 - configs/P1020RDB-PD_NAND_defconfig | 2 - configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 - configs/P2020RDB-PC_NAND_defconfig | 2 - configs/T1024RDB_NAND_defconfig | 2 - configs/T1042D4RDB_NAND_defconfig | 2 - configs/T2080QDS_NAND_defconfig | 2 - configs/T2080RDB_NAND_defconfig | 2 - configs/T2080RDB_revD_NAND_defconfig | 2 - include/configs/P1010RDB.h | 4 + include/configs/T102xRDB.h | 3 + include/configs/T104xRDB.h | 3 + include/configs/T208xQDS.h | 3 + include/configs/T208xRDB.h | 3 + include/configs/p1_p2_rdb_pc.h | 4 + 21 files changed, 20 insertions(+), 125 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds deleted file mode 100644 index 75b0285e4e51..000000000000 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +++ /dev/null @@ -1,97 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2009-2012 Freescale Semiconductor, Inc. - */ - -#include "config.h" - -#ifndef CONFIG_SYS_MONITOR_LEN -#define CONFIG_SYS_MONITOR_LEN 0x80000 -#endif - -OUTPUT_ARCH(powerpc) -/* Do we need any of these for elf? - __DYNAMIC = 0; */ -PHDRS -{ - text PT_LOAD; - bss PT_LOAD; -} - -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = + SIZEOF_HEADERS; - .interp : { *(.interp) } - .text : - { - *(.text*) - } :text - _etext = .; - PROVIDE (etext = .); - .rodata : - { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } :text - - /* Read-write section, merged into data segment: */ - . = (. + 0x00FF) & 0xFFFFFF00; - _erotext = .; - PROVIDE (erotext = .); - .reloc : - { - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } - __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; - __fixup_entries = (. - _FIXUP_TABLE_) >> 2; - - .data : - { - *(.data*) - *(.sdata*) - } - _edata = .; - PROVIDE (edata = .); - - . = .; - - .u_boot_list : { - KEEP(*(SORT(.u_boot_list*))); - } - - . = .; - __start___ex_table = .; - __ex_table : { *(__ex_table) } - __stop___ex_table = .; - - . = ALIGN(256); - __init_begin = .; - .text.init : { *(.text.init) } - .data.init : { *(.data.init) } - . = ALIGN(256); - __init_end = .; - _end = .; - - .bootpg ADDR(.text) - 0x1000 : - { - KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg)) - } :text = 0xffff - - . = ADDR(.text) + CONFIG_SYS_MONITOR_LEN; - - __bss_start = .; - .bss (NOLOAD) : - { - *(.sbss*) - *(.bss*) - *(COMMON) - } :bss - - . = ALIGN(4); - __bss_end = . ; - PROVIDE (end = .); -} diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig index 314d73a8ae1e..d9887d78ad2f 100644 --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig @@ -15,8 +15,6 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_PHYS_64BIT=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig index fde12ea861b6..1b25ea97f70a 100644 --- a/configs/P1010RDB-PA_NAND_defconfig +++ b/configs/P1010RDB-PA_NAND_defconfig @@ -14,8 +14,6 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig index f6dfc16edef3..cfc9c6da9514 100644 --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig @@ -15,8 +15,6 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_PHYS_64BIT=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig index be614b85b725..4df93a73f519 100644 --- a/configs/P1010RDB-PB_NAND_defconfig +++ b/configs/P1010RDB-PB_NAND_defconfig @@ -14,8 +14,6 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig index a8bc420f638e..641862c7d05f 100644 --- a/configs/P1020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig @@ -15,8 +15,6 @@ CONFIG_MPC85xx=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y CONFIG_PHYS_64BIT=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig index 3a41738eede4..45414d4d467c 100644 --- a/configs/P1020RDB-PC_NAND_defconfig +++ b/configs/P1020RDB-PC_NAND_defconfig @@ -14,8 +14,6 @@ CONFIG_SPL=y CONFIG_MPC85xx=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig index bc277c600d01..be048d6b4ae1 100644 --- a/configs/P1020RDB-PD_NAND_defconfig +++ b/configs/P1020RDB-PD_NAND_defconfig @@ -14,8 +14,6 @@ CONFIG_SPL=y CONFIG_MPC85xx=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PD=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig index 3f3d30f2f132..4dec31dd6f16 100644 --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig @@ -15,8 +15,6 @@ CONFIG_MPC85xx=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y CONFIG_PHYS_64BIT=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig index 73e8a5c5714c..ac47534286be 100644 --- a/configs/P2020RDB-PC_NAND_defconfig +++ b/configs/P2020RDB-PC_NAND_defconfig @@ -14,8 +14,6 @@ CONFIG_SPL=y CONFIG_MPC85xx=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig index 20ded48a3515..982075f9458b 100644 --- a/configs/T1024RDB_NAND_defconfig +++ b/configs/T1024RDB_NAND_defconfig @@ -14,8 +14,6 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T1024RDB=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig index a755d9c70296..5ef496a4bafb 100644 --- a/configs/T1042D4RDB_NAND_defconfig +++ b/configs/T1042D4RDB_NAND_defconfig @@ -11,8 +11,6 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T1042D4RDB=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig index 1b6ef8aaa1f2..261c8ecc8630 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -16,8 +16,6 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index 1c55d30b5e18..523226a4aaa4 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -17,8 +17,6 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080RDB=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig index ae924b18173f..5e0ee9c0616d 100644 --- a/configs/T2080RDB_revD_NAND_defconfig +++ b/configs/T2080RDB_revD_NAND_defconfig @@ -18,8 +18,6 @@ CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080RDB=y CONFIG_T2080RDB_REV_D=y -CONFIG_SYS_CUSTOM_LDSCRIPT=y -CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 106d1e6a4b7e..9b79e19764fc 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -81,6 +81,10 @@ #define CONFIG_SYS_NAND_U_BOOT_SIZE (128 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0xD0000000 #define CONFIG_SYS_NAND_U_BOOT_START 0xD0000000 +#else +#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR +#define CONFIG_SYS_MPC85XX_NO_RESETVEC +#endif #endif #define CONFIG_SPL_PAD_TO 0x20000 #define CONFIG_TPL_PAD_TO 0x20000 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index d24cfce8b3b9..9782af2039f1 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -41,6 +41,9 @@ #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 +#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR +#define CONFIG_SYS_MPC85XX_NO_RESETVEC +#endif #endif #ifdef CONFIG_SPIFLASH diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 9433f14227bb..1159d508ff7e 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -40,6 +40,9 @@ #endif #define CONFIG_SYS_NAND_U_BOOT_DST 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 +#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR +#define CONFIG_SYS_MPC85XX_NO_RESETVEC +#endif #endif #ifdef CONFIG_SPIFLASH diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index a41f9f0d9b83..43ae78b388f5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -44,6 +44,9 @@ #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 +#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR +#define CONFIG_SYS_MPC85XX_NO_RESETVEC +#endif #endif #ifdef CONFIG_SPIFLASH diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 7165ba082833..0a15ec0dc985 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -39,6 +39,9 @@ #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 +#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR +#define CONFIG_SYS_MPC85XX_NO_RESETVEC +#endif #endif #ifdef CONFIG_SPIFLASH diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 92008cd38e49..42adfabe509c 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -114,6 +114,10 @@ #define CONFIG_SYS_NAND_U_BOOT_SIZE (128 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0xf8f80000 #define CONFIG_SYS_NAND_U_BOOT_START 0xf8f80000 +#else +#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR +#define CONFIG_SYS_MPC85XX_NO_RESETVEC +#endif #endif /* not CONFIG_TPL_BUILD */ #define CONFIG_SPL_PAD_TO 0x20000 -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH 3/8] powerpc: mpc85xx: Remove u-boot-nand_spl.lds 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár 2022-04-05 13:12 ` [PATCH 1/8] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support Pali Rohár 2022-04-05 13:12 ` [PATCH 2/8] powerpc: mpc85xx: Remove duplicate u-boot-nand.lds Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 4/8] powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld script Pali Rohár ` (5 subsequent siblings) 8 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot mpc85xx SPL NAND linker script u-boot-nand_spl.lds is not used since Jun 2014 commit 0234446fd171 ("nand_spl: remove MPC8536DS support"). Remove it. Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 68 -------------------- 1 file changed, 68 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds deleted file mode 100644 index a2193bf76802..000000000000 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds +++ /dev/null @@ -1,68 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2006 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de - * - * Copyright 2009 Freescale Semiconductor, Inc. - */ - -#include "config.h" - -OUTPUT_ARCH(powerpc) -SECTIONS -{ - . = 0xfff00000; - .text : { - *(.text*) - } - _etext = .; - - .reloc : { - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } - __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; - __fixup_entries = (. - _FIXUP_TABLE_) >> 2; - - . = ALIGN(8); - .data : { - *(.rodata*) - *(.data*) - *(.sdata*) - } - _edata = .; - - .u_boot_list : { - KEEP(*(SORT(.u_boot_list*))); - } - - . = ALIGN(8); - __init_begin = .; - __init_end = .; - _end = .; -#if defined(CONFIG_FSL_IFC) /* Restrict bootpg at 4K boundry for IFC */ - .bootpg ADDR(.text) + 0x1000 : - { - start.o (.bootpg) - } -#define RESET_VECTOR_OFFSET 0x1ffc /* IFC has 8K sram */ -#elif defined(CONFIG_FSL_ELBC) -#define RESET_VECTOR_OFFSET 0xffc /* LBC has 4k sram */ -#else -#error unknown NAND controller -#endif - .resetvec ADDR(.text) + RESET_VECTOR_OFFSET : { - KEEP(*(.resetvec)) - } = 0xffff - - __bss_start = .; - .bss : { - *(.sbss*) - *(.bss*) - } - __bss_end = .; -} -ASSERT(__init_end <= (0xfff00000 + RESET_VECTOR_OFFSET), "NAND bootstrap too big"); -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH 4/8] powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld script 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár ` (2 preceding siblings ...) 2022-04-05 13:12 ` [PATCH 3/8] powerpc: mpc85xx: Remove u-boot-nand_spl.lds Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 5/8] powerpc: mpc85xx: Put bss after image when not including reset vector Pali Rohár ` (4 subsequent siblings) 8 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot .interp section is not available in output ELF binary and SIZEOF_HEADERS is needed at all. There is no change in generated u-boot.bin binary. Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/powerpc/cpu/mpc85xx/u-boot.lds | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 48509dbdae01..565d5deb530a 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -27,8 +27,6 @@ PHDRS SECTIONS { /* Read-only sections, merged into text segment: */ - . = + SIZEOF_HEADERS; - .interp : { *(.interp) } .text : { *(.text*) -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH 5/8] powerpc: mpc85xx: Put bss after image when not including reset vector 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár ` (3 preceding siblings ...) 2022-04-05 13:12 ` [PATCH 4/8] powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld script Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 6/8] powerpc: mpc85xx: Define linker sections in ascending order Pali Rohár ` (3 subsequent siblings) 8 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot Linker knows exact size of the image, so there is no need to use CONFIG_SYS_MONITOR_LEN macro (which should be upper limit). Remove usage of CONFIG_SYS_MONITOR_LEN macro to simplify setup. Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/powerpc/cpu/mpc85xx/u-boot.lds | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 565d5deb530a..9d0f0d58d804 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -11,10 +11,6 @@ #define RESET_VECTOR_ADDRESS 0xfffffffc #endif -#ifndef CONFIG_SYS_MONITOR_LEN -#define CONFIG_SYS_MONITOR_LEN 0x80000 -#endif - OUTPUT_ARCH(powerpc) ENTRY(_start) @@ -86,7 +82,7 @@ SECTIONS { KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg)) } :text = 0xffff - . = ADDR(.text) + CONFIG_SYS_MONITOR_LEN; + . = _end; #else .bootpg RESET_VECTOR_ADDRESS - 0xffc : { -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH 6/8] powerpc: mpc85xx: Define linker sections in ascending order 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár ` (4 preceding siblings ...) 2022-04-05 13:12 ` [PATCH 5/8] powerpc: mpc85xx: Put bss after image when not including reset vector Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values Pali Rohár ` (2 subsequent siblings) 8 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot It is too confusing if sections are defined in non-ascending order. Also linker has to go backward and then again forward when generating final binary. To make future changes easier, define all linker sections in ascending order. Signed-off-by: Pali Rohár <pali@kernel.org> --- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 20 +++++++++++--------- arch/powerpc/cpu/mpc85xx/u-boot.lds | 15 ++++++++------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index 27a5fe6306a3..1b4d1e05a4a3 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -18,6 +18,13 @@ PHDRS #endif SECTIONS { +/* 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*) @@ -67,18 +74,13 @@ SECTIONS __bss_end = .; #endif -/* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */ -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC - .bootpg ADDR(.text) - 0x1000 : - { - KEEP(*(.bootpg)) - } :text = 0xffff -#else +/* For nor and nand is needed the SPL with section .resetvec */ +#ifndef CONFIG_SYS_MPC85XX_NO_RESETVEC #if defined(CONFIG_FSL_IFC) /* Restrict bootpg at 4K boundry for IFC */ #ifndef BOOT_PAGE_OFFSET #define BOOT_PAGE_OFFSET 0x1000 #endif - .bootpg ADDR(.text) + BOOT_PAGE_OFFSET : + .bootpg IMAGE_TEXT_BASE + BOOT_PAGE_OFFSET : { arch/powerpc/cpu/mpc85xx/start.o (.bootpg) } @@ -90,7 +92,7 @@ SECTIONS #else #error unknown NAND controller #endif - .resetvec ADDR(.text) + RESET_VECTOR_OFFSET : { + .resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : { KEEP(*(.resetvec)) } = 0xffff #endif diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 9d0f0d58d804..e1bbee43bcb4 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -23,6 +23,13 @@ PHDRS SECTIONS { /* Read-only sections, merged into text segment: */ +#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC + .bootpg CONFIG_SYS_TEXT_BASE - 0x1000 : + { + KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg)) + } :text = 0xffff + . = CONFIG_SYS_TEXT_BASE; +#endif .text : { *(.text*) @@ -77,13 +84,7 @@ SECTIONS __init_end = .; _end = .; -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC - .bootpg ADDR(.text) - 0x1000 : - { - KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg)) - } :text = 0xffff - . = _end; -#else +#ifndef CONFIG_SYS_MPC85XX_NO_RESETVEC .bootpg RESET_VECTOR_ADDRESS - 0xffc : { arch/powerpc/cpu/mpc85xx/start.o (.bootpg) -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár ` (5 preceding siblings ...) 2022-04-05 13:12 ` [PATCH 6/8] powerpc: mpc85xx: Define linker sections in ascending order Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-04-25 4:27 ` Priyanka Jain (OSS) 2022-04-25 12:29 ` [PATCH v2] " Pali Rohár 2022-04-05 13:12 ` [PATCH 8/8] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros Pali Rohár 2022-04-05 17:03 ` [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Sinan Akman 8 siblings, 2 replies; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot 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> --- 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 | 4 ++-- configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 4 ++-- configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 4 ++-- configs/P1010RDB-PA_NAND_defconfig | 4 ++-- configs/P1010RDB-PA_SDCARD_defconfig | 4 ++-- configs/P1010RDB-PA_SPIFLASH_defconfig | 4 ++-- configs/P1010RDB-PB_36BIT_NAND_defconfig | 4 ++-- configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 4 ++-- configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 4 ++-- configs/P1010RDB-PB_NAND_defconfig | 4 ++-- configs/P1010RDB-PB_SDCARD_defconfig | 4 ++-- configs/P1010RDB-PB_SPIFLASH_defconfig | 4 ++-- configs/P1020RDB-PC_36BIT_NAND_defconfig | 4 ++-- configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 4 ++-- configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 4 ++-- configs/P1020RDB-PC_NAND_defconfig | 4 ++-- configs/P1020RDB-PC_SDCARD_defconfig | 4 ++-- configs/P1020RDB-PC_SPIFLASH_defconfig | 4 ++-- configs/P1020RDB-PD_NAND_defconfig | 4 ++-- configs/P1020RDB-PD_SDCARD_defconfig | 4 ++-- configs/P1020RDB-PD_SPIFLASH_defconfig | 4 ++-- configs/P2020RDB-PC_36BIT_NAND_defconfig | 4 ++-- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 4 ++-- configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 4 ++-- configs/P2020RDB-PC_NAND_defconfig | 4 ++-- configs/P2020RDB-PC_SDCARD_defconfig | 4 ++-- configs/P2020RDB-PC_SPIFLASH_defconfig | 4 ++-- 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 | 2 +- include/configs/P1010RDB.h | 6 ++--- include/configs/p1_p2_rdb_pc.h | 6 ++--- 49 files changed, 89 insertions(+), 108 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index f62dd79805ca..796a58b929ec 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1127,7 +1127,7 @@ switch_as: /*--------------------------------------------------------------*/ lis r3,CONFIG_SYS_MONITOR_BASE@h ori r3,r3,CONFIG_SYS_MONITOR_BASE@l - addi r3,r3,_start_cont - _start_cont + addi r3,r3,_start_cont - CONFIG_SYS_MONITOR_BASE mtlr r3 blr #endif @@ -1599,7 +1599,7 @@ relocate_code: * initialization, now running from RAM. */ - addi r0,r10,in_ram - _start_cont + addi r0,r10,in_ram - CONFIG_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 d9887d78ad2f..999c1143297e 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_SPL_DRIVERS_MISC=y diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig index ca149b0b26d4..41f1c7187616 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 0d1f1568e2d6..471404e66263 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 1b25ea97f70a..d5d3b6259ef3 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_SPL_DRIVERS_MISC=y diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig index 0032f2779099..03876c1cc7ab 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 e40cd4f93d01..93f6a711011c 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 cfc9c6da9514..9a9952152acc 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_SPL_DRIVERS_MISC=y diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig index 6a346fba2ac2..6f3a831bcaa6 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 5e31d18a5f8f..954298638720 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 4df93a73f519..4fd5d0aa814f 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_SPL_DRIVERS_MISC=y diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig index e102207afff3..5571534c9c89 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 52dfbbaae3ac..29c05c49ea3d 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 641862c7d05f..573b0db81469 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_SPL=y diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig index e9ee3cfdb110..02d732ce6a4b 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 diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig index 3f5a7cee0e22..aea21ae4ca74 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 diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig index 45414d4d467c..5f40a50c8606 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_SPL=y diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig index 395f0b2d8914..0d8384011563 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 diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig index 5269c39ce98f..c57a1fc7a22e 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 diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig index be048d6b4ae1..c16c7c3ed039 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_SPL=y diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig index ed6b3393c27a..bc9a13b0b8b4 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 diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig index 7cad6ce45240..2a7fb3864e8e 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 diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig index 4dec31dd6f16..af24940dd8cd 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_SPL=y diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig index 3acb251e1e0d..5c4da5da3884 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 diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig index e545c294e09a..d431035a01e7 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 diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig index ac47534286be..f9cb43fb9fe2 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_SPL=y diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig index 614ff521b90e..eb60b6eac217 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 diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig index 325a238fbfab..f21303d63fad 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 diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig index 982075f9458b..cbd6169ef938 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 8a82082968c8..c1761471170d 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 87d40831d9c3..1480240a0eab 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 5ef496a4bafb..6314e3e092b0 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 efb46b3bf2fd..9122e74bc659 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 1568c797bf3e..47c9d4471faa 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 261c8ecc8630..64a6bae85aa1 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 8ab1c5d6809f..befbdc1d6525 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 8fd024848ad6..9a56eb6a170c 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 523226a4aaa4..8f24d20f1393 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_SYS_MEMTEST_START=0x00200000 diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig index ea9c479825cc..9263cb888fcb 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_SYS_MEMTEST_START=0x00200000 diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index 5e08b82406ac..d3bf43608dbe 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_SYS_MEMTEST_START=0x00200000 diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig index 5e0ee9c0616d..a5cc119c0cc4 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_SYS_MEMTEST_START=0x00200000 diff --git a/configs/T2080RDB_revD_SDCARD_defconfig b/configs/T2080RDB_revD_SDCARD_defconfig index fef08931d0dd..7887c0290fbe 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_SYS_MEMTEST_START=0x00200000 diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig index 0b7e71567da5..4e30f5badbc5 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_SYS_MEMTEST_START=0x00200000 diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig index ea6a5284959e..fec3a52af2dd 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 d1f928d69128..22b75637e715 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 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9b79e19764fc..67c111673b89 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -102,7 +102,7 @@ #endif #ifdef CONFIG_TPL_BUILD -#define CONFIG_SYS_MONITOR_BASE 0xD0001000 +#define CONFIG_SYS_MONITOR_BASE 0xD0000000 #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else @@ -442,7 +442,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) @@ -453,7 +453,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 42adfabe509c..dd1bc8ca30f9 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -131,7 +131,7 @@ #ifndef CONFIG_SYS_MONITOR_BASE #ifdef CONFIG_TPL_BUILD -#define CONFIG_SYS_MONITOR_BASE 0xf8f81000 +#define CONFIG_SYS_MONITOR_BASE 0xf8f80000 #elif defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else @@ -372,7 +372,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) @@ -386,7 +386,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) -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* RE: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-04-05 13:12 ` [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values Pali Rohár @ 2022-04-25 4:27 ` Priyanka Jain (OSS) 2022-04-25 12:31 ` Pali Rohár 2022-04-25 12:29 ` [PATCH v2] " Pali Rohár 1 sibling, 1 reply; 39+ messages in thread From: Priyanka Jain (OSS) @ 2022-04-25 4:27 UTC (permalink / raw) To: Pali Rohár, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot >-----Original Message----- >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Pali Rohár >Sent: Tuesday, April 5, 2022 6:43 PM >To: Priyanka Jain <priyanka.jain@nxp.com>; Qiang Zhao <qiang.zhao@nxp.com>; >Shengzhou Liu <shengzhou.liu@nxp.com>; Alexander Graf <agraf@csgraf.de>; >Bin Meng <bmeng.cn@gmail.com>; Wolfgang Denk <wd@denx.de>; Sinan >Akman <sinan@writeme.com> >Cc: u-boot@lists.denx.de >Subject: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base >values > >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> >--- Kindly rebase to top of tree. There has been changed related configs. I am picking patches till 6/8. So just send next version of 7/8 and 8/8 Regards Priyanka ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-04-25 4:27 ` Priyanka Jain (OSS) @ 2022-04-25 12:31 ` Pali Rohár 2022-05-11 18:59 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-04-25 12:31 UTC (permalink / raw) To: Priyanka Jain (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot On Monday 25 April 2022 04:27:51 Priyanka Jain (OSS) wrote: > >-----Original Message----- > >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Pali Rohár > >Sent: Tuesday, April 5, 2022 6:43 PM > >To: Priyanka Jain <priyanka.jain@nxp.com>; Qiang Zhao <qiang.zhao@nxp.com>; > >Shengzhou Liu <shengzhou.liu@nxp.com>; Alexander Graf <agraf@csgraf.de>; > >Bin Meng <bmeng.cn@gmail.com>; Wolfgang Denk <wd@denx.de>; Sinan > >Akman <sinan@writeme.com> > >Cc: u-boot@lists.denx.de > >Subject: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base > >values > > > >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> > >--- > > Kindly rebase to top of tree. There has been changed related configs. > I am picking patches till 6/8. So just send next version of 7/8 and 8/8 Done! I rebased 7/8 on top of master and sent V2 to ML. 8/8 in current version still cleanly applied on 7/8, so I did not resent it. If there is some issue, please let me know. ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-04-25 12:31 ` Pali Rohár @ 2022-05-11 18:59 ` Pali Rohár 2022-05-18 10:51 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-05-11 18:59 UTC (permalink / raw) To: Priyanka Jain (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot On Monday 25 April 2022 14:31:16 Pali Rohár wrote: > On Monday 25 April 2022 04:27:51 Priyanka Jain (OSS) wrote: > > >-----Original Message----- > > >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Pali Rohár > > >Sent: Tuesday, April 5, 2022 6:43 PM > > >To: Priyanka Jain <priyanka.jain@nxp.com>; Qiang Zhao <qiang.zhao@nxp.com>; > > >Shengzhou Liu <shengzhou.liu@nxp.com>; Alexander Graf <agraf@csgraf.de>; > > >Bin Meng <bmeng.cn@gmail.com>; Wolfgang Denk <wd@denx.de>; Sinan > > >Akman <sinan@writeme.com> > > >Cc: u-boot@lists.denx.de > > >Subject: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base > > >values > > > > > >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> > > >--- > > > > Kindly rebase to top of tree. There has been changed related configs. > > I am picking patches till 6/8. So just send next version of 7/8 and 8/8 > > Done! I rebased 7/8 on top of master and sent V2 to ML. 8/8 in current > version still cleanly applied on 7/8, so I did not resent it. If there > is some issue, please let me know. PING? ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-05-11 18:59 ` Pali Rohár @ 2022-05-18 10:51 ` Pali Rohár 2022-06-04 13:01 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-05-18 10:51 UTC (permalink / raw) To: Priyanka Jain (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot On Wednesday 11 May 2022 20:59:24 Pali Rohár wrote: > On Monday 25 April 2022 14:31:16 Pali Rohár wrote: > > On Monday 25 April 2022 04:27:51 Priyanka Jain (OSS) wrote: > > > >-----Original Message----- > > > >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Pali Rohár > > > >Sent: Tuesday, April 5, 2022 6:43 PM > > > >To: Priyanka Jain <priyanka.jain@nxp.com>; Qiang Zhao <qiang.zhao@nxp.com>; > > > >Shengzhou Liu <shengzhou.liu@nxp.com>; Alexander Graf <agraf@csgraf.de>; > > > >Bin Meng <bmeng.cn@gmail.com>; Wolfgang Denk <wd@denx.de>; Sinan > > > >Akman <sinan@writeme.com> > > > >Cc: u-boot@lists.denx.de > > > >Subject: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base > > > >values > > > > > > > >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> > > > >--- > > > > > > Kindly rebase to top of tree. There has been changed related configs. > > > I am picking patches till 6/8. So just send next version of 7/8 and 8/8 > > > > Done! I rebased 7/8 on top of master and sent V2 to ML. 8/8 in current > > version still cleanly applied on 7/8, so I did not resent it. If there > > is some issue, please let me know. > > PING? Priyanka: PING ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-05-18 10:51 ` Pali Rohár @ 2022-06-04 13:01 ` Pali Rohár 0 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-06-04 13:01 UTC (permalink / raw) To: Priyanka Jain (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot On Wednesday 18 May 2022 12:51:14 Pali Rohár wrote: > On Wednesday 11 May 2022 20:59:24 Pali Rohár wrote: > > On Monday 25 April 2022 14:31:16 Pali Rohár wrote: > > > On Monday 25 April 2022 04:27:51 Priyanka Jain (OSS) wrote: > > > > >-----Original Message----- > > > > >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Pali Rohár > > > > >Sent: Tuesday, April 5, 2022 6:43 PM > > > > >To: Priyanka Jain <priyanka.jain@nxp.com>; Qiang Zhao <qiang.zhao@nxp.com>; > > > > >Shengzhou Liu <shengzhou.liu@nxp.com>; Alexander Graf <agraf@csgraf.de>; > > > > >Bin Meng <bmeng.cn@gmail.com>; Wolfgang Denk <wd@denx.de>; Sinan > > > > >Akman <sinan@writeme.com> > > > > >Cc: u-boot@lists.denx.de > > > > >Subject: [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base > > > > >values > > > > > > > > > >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> > > > > >--- > > > > > > > > Kindly rebase to top of tree. There has been changed related configs. > > > > I am picking patches till 6/8. So just send next version of 7/8 and 8/8 > > > > > > Done! I rebased 7/8 on top of master and sent V2 to ML. 8/8 in current > > > version still cleanly applied on 7/8, so I did not resent it. If there > > > is some issue, please let me know. > > > > PING? > > Priyanka: PING PING? ^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v2] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-04-05 13:12 ` [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values Pali Rohár 2022-04-25 4:27 ` Priyanka Jain (OSS) @ 2022-04-25 12:29 ` Pali Rohár 2022-06-16 8:57 ` Peng Fan (OSS) 1 sibling, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-04-25 12:29 UTC (permalink / raw) To: Priyanka Jain (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot 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 --- 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) -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [PATCH v2] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-04-25 12:29 ` [PATCH v2] " Pali Rohár @ 2022-06-16 8:57 ` Peng Fan (OSS) 2022-06-16 9:30 ` Pali Rohár 2022-06-16 12:19 ` [PATCH v3] " Pali Rohár 0 siblings, 2 replies; 39+ messages in thread From: Peng Fan (OSS) @ 2022-06-16 8:57 UTC (permalink / raw) To: Pali Rohár, Priyanka Jain (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot 在 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. 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) ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-16 8:57 ` Peng Fan (OSS) @ 2022-06-16 9:30 ` Pali Rohár 2022-06-16 12:19 ` [PATCH v3] " Pali Rohár 1 sibling, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-06-16 9:30 UTC (permalink / raw) To: Peng Fan (OSS) Cc: Priyanka Jain (OSS), Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot 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) > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH v3] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-16 8:57 ` Peng Fan (OSS) 2022-06-16 9:30 ` Pali Rohár @ 2022-06-16 12:19 ` Pali Rohár 2022-06-23 11:29 ` Pali Rohár 2022-06-28 14:52 ` Tom Rini 1 sibling, 2 replies; 39+ messages in thread From: Pali Rohár @ 2022-06-16 12:19 UTC (permalink / raw) To: Priyanka Jain (OSS), Peng Fan (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot 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 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 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [PATCH v3] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-16 12:19 ` [PATCH v3] " Pali Rohár @ 2022-06-23 11:29 ` Pali Rohár 2022-06-23 12:34 ` Tom Rini 2022-06-28 14:52 ` Tom Rini 1 sibling, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-06-23 11:29 UTC (permalink / raw) To: Priyanka Jain (OSS), Peng Fan (OSS) Cc: Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot 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 > ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-23 11:29 ` Pali Rohár @ 2022-06-23 12:34 ` Tom Rini 2022-06-28 9:18 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Tom Rini @ 2022-06-23 12:34 UTC (permalink / raw) To: Pali Rohár Cc: Priyanka Jain (OSS), Peng Fan (OSS), Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot [-- Attachment #1: Type: text/plain, Size: 1789 bytes --] On Thu, Jun 23, 2022 at 01:29:10PM +0200, Pali Rohár wrote: > 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??? > Yes, I thought this was part of fsl-qoriq-2022-6-20-v2 but I see it is not. I really don't want to see this have problems to apply, again. But it probably will if it's not picked up pretty much now. Peng, should I grab this for next? Otherwise someone is going to need to grab this, edit and recountdiff it for it to apply as it's really not fair to ask Pali to rebase it yet again if it doesn't and git also doesn't handle it on a rebase. -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-23 12:34 ` Tom Rini @ 2022-06-28 9:18 ` Pali Rohár 2022-06-28 13:42 ` Tom Rini 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-06-28 9:18 UTC (permalink / raw) To: Tom Rini Cc: Priyanka Jain (OSS), Peng Fan (OSS), Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot On Thursday 23 June 2022 08:34:58 Tom Rini wrote: > On Thu, Jun 23, 2022 at 01:29:10PM +0200, Pali Rohár wrote: > > 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??? > > > > Yes, I thought this was part of fsl-qoriq-2022-6-20-v2 but I see it is > not. I really don't want to see this have problems to apply, again. > But it probably will if it's not picked up pretty much now. Peng, > should I grab this for next? Otherwise someone is going to need to grab > this, edit and recountdiff it for it to apply as it's really not fair to > ask Pali to rebase it yet again if it doesn't and git also doesn't > handle it on a rebase. > > -- > Tom Hm... So how to process this? ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-28 9:18 ` Pali Rohár @ 2022-06-28 13:42 ` Tom Rini 0 siblings, 0 replies; 39+ messages in thread From: Tom Rini @ 2022-06-28 13:42 UTC (permalink / raw) To: Pali Rohár Cc: Priyanka Jain (OSS), Peng Fan (OSS), Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot [-- Attachment #1: Type: text/plain, Size: 2253 bytes --] On Tue, Jun 28, 2022 at 11:18:34AM +0200, Pali Rohár wrote: > On Thursday 23 June 2022 08:34:58 Tom Rini wrote: > > On Thu, Jun 23, 2022 at 01:29:10PM +0200, Pali Rohár wrote: > > > 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??? > > > > > > > Yes, I thought this was part of fsl-qoriq-2022-6-20-v2 but I see it is > > not. I really don't want to see this have problems to apply, again. > > But it probably will if it's not picked up pretty much now. Peng, > > should I grab this for next? Otherwise someone is going to need to grab > > this, edit and recountdiff it for it to apply as it's really not fair to > > ask Pali to rebase it yet again if it doesn't and git also doesn't > > handle it on a rebase. > > Hm... So how to process this? It's already not applying cleanly, so I've re-applied it and I'm putting it through CI (along with some aspeed fixes) right now. It should end up in next later today. -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-16 12:19 ` [PATCH v3] " Pali Rohár 2022-06-23 11:29 ` Pali Rohár @ 2022-06-28 14:52 ` Tom Rini 2022-06-28 17:43 ` Pali Rohár 1 sibling, 1 reply; 39+ messages in thread From: Tom Rini @ 2022-06-28 14:52 UTC (permalink / raw) To: Pali Rohár Cc: Priyanka Jain (OSS), Peng Fan (OSS), Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot [-- Attachment #1: Type: text/plain, Size: 1249 bytes --] On Thu, Jun 16, 2022 at 02:19:44PM +0200, 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> Applied to u-boot/next, thanks! -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v3] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values 2022-06-28 14:52 ` Tom Rini @ 2022-06-28 17:43 ` Pali Rohár 0 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-06-28 17:43 UTC (permalink / raw) To: Tom Rini Cc: Priyanka Jain (OSS), Peng Fan (OSS), Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman, u-boot On Tuesday 28 June 2022 10:52:23 Tom Rini wrote: > On Thu, Jun 16, 2022 at 02:19:44PM +0200, 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> > > Applied to u-boot/next, thanks! > > -- > Tom Thanks! ^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH 8/8] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár ` (6 preceding siblings ...) 2022-04-05 13:12 ` [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values Pali Rohár @ 2022-04-05 13:12 ` Pali Rohár 2022-06-28 17:53 ` [PATCH v2] " Pali Rohár 2022-04-05 17:03 ` [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Sinan Akman 8 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-04-05 13:12 UTC (permalink / raw) To: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, Sinan Akman Cc: u-boot Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. No functional change. Signed-off-by: Pali Rohár <pali@kernel.org> --- include/configs/p1_p2_rdb_pc.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index dd1bc8ca30f9..0d1cc218fac0 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -73,11 +73,11 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_PAD_TO 0x20000 -#define CONFIG_SPL_MAX_SIZE (128 * 1024) +#define CONFIG_SPL_MAX_SIZE CONFIG_SPL_PAD_TO #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO #define CONFIG_SYS_MPC85XX_NO_RESETVEC #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_COMMON_INIT_DDR @@ -87,11 +87,11 @@ #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_PAD_TO 0x20000 -#define CONFIG_SPL_MAX_SIZE (128 * 1024) +#define CONFIG_SPL_MAX_SIZE CONFIG_SPL_PAD_TO #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO #define CONFIG_SYS_MPC85XX_NO_RESETVEC #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_COMMON_INIT_DDR -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-04-05 13:12 ` [PATCH 8/8] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros Pali Rohár @ 2022-06-28 17:53 ` Pali Rohár 2022-06-28 18:17 ` Tom Rini 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-06-28 17:53 UTC (permalink / raw) To: Priyanka Jain, Peng Fan (OSS), Tom Rini; +Cc: u-boot Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. No functional change. Signed-off-by: Pali Rohár <pali@kernel.org> --- Changes in v2: * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 --- include/configs/p1_p2_rdb_pc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 56a16502dcc7..7237e3c1a63c 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -78,15 +78,15 @@ #ifdef CONFIG_SDCARD #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO #define CONFIG_SYS_MPC85XX_NO_RESETVEC #elif defined(CONFIG_SPIFLASH) #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO #define CONFIG_SYS_MPC85XX_NO_RESETVEC #elif defined(CONFIG_MTD_RAW_NAND) #ifdef CONFIG_TPL_BUILD -- 2.20.1 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 17:53 ` [PATCH v2] " Pali Rohár @ 2022-06-28 18:17 ` Tom Rini 2022-06-28 18:22 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Tom Rini @ 2022-06-28 18:17 UTC (permalink / raw) To: Pali Rohár; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot [-- Attachment #1: Type: text/plain, Size: 2062 bytes --] On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > No functional change. > > Signed-off-by: Pali Rohár <pali@kernel.org> > --- > Changes in v2: > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > --- > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > index 56a16502dcc7..7237e3c1a63c 100644 > --- a/include/configs/p1_p2_rdb_pc.h > +++ b/include/configs/p1_p2_rdb_pc.h > @@ -78,15 +78,15 @@ > > #ifdef CONFIG_SDCARD > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > #elif defined(CONFIG_SPIFLASH) > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > #elif defined(CONFIG_MTD_RAW_NAND) > #ifdef CONFIG_TPL_BUILD So, this is entirely a PowerPC spl set of CONFIG variables. Can we move them to Kconfig, and use default xxx as you're changing them to above? The other platforms using this look to be doing the same at first glance. -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:17 ` Tom Rini @ 2022-06-28 18:22 ` Pali Rohár 2022-06-28 18:28 ` Tom Rini 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-06-28 18:22 UTC (permalink / raw) To: Tom Rini; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > No functional change. > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > --- > > Changes in v2: > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > --- > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > index 56a16502dcc7..7237e3c1a63c 100644 > > --- a/include/configs/p1_p2_rdb_pc.h > > +++ b/include/configs/p1_p2_rdb_pc.h > > @@ -78,15 +78,15 @@ > > > > #ifdef CONFIG_SDCARD > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > #elif defined(CONFIG_SPIFLASH) > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > #elif defined(CONFIG_MTD_RAW_NAND) > > #ifdef CONFIG_TPL_BUILD > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > them to Kconfig, and use default xxx as you're changing them to above? > The other platforms using this look to be doing the same at first > glance. > > -- > Tom Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need to be adjusted by size of boot sector, as is in this patch: https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ So I just sent patch in current form which simplify definitions of CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:22 ` Pali Rohár @ 2022-06-28 18:28 ` Tom Rini 2022-06-28 18:34 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Tom Rini @ 2022-06-28 18:28 UTC (permalink / raw) To: Pali Rohár; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot [-- Attachment #1: Type: text/plain, Size: 3232 bytes --] On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > No functional change. > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > --- > > > Changes in v2: > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > --- > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > --- a/include/configs/p1_p2_rdb_pc.h > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > @@ -78,15 +78,15 @@ > > > > > > #ifdef CONFIG_SDCARD > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > #elif defined(CONFIG_SPIFLASH) > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > #ifdef CONFIG_TPL_BUILD > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > them to Kconfig, and use default xxx as you're changing them to above? > > The other platforms using this look to be doing the same at first > > glance. > > > > -- > > Tom > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > to be adjusted by size of boot sector, as is in this patch: > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > So I just sent patch in current form which simplify definitions of > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, one file), remove it from CONFIG space, make it file local, and FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and what needs to be just something else, and what can be cleaned up / removed, so I really want to figure out a solution here that migrates the symbols or removes them from CONFIG namespace. -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:28 ` Tom Rini @ 2022-06-28 18:34 ` Pali Rohár 2022-06-28 18:39 ` Tom Rini 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-06-28 18:34 UTC (permalink / raw) To: Tom Rini; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot On Tuesday 28 June 2022 14:28:52 Tom Rini wrote: > On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > No functional change. > > > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > > --- > > > > Changes in v2: > > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > > --- > > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > > --- a/include/configs/p1_p2_rdb_pc.h > > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > > @@ -78,15 +78,15 @@ > > > > > > > > #ifdef CONFIG_SDCARD > > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > #elif defined(CONFIG_SPIFLASH) > > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > > #ifdef CONFIG_TPL_BUILD > > > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > > them to Kconfig, and use default xxx as you're changing them to above? > > > The other platforms using this look to be doing the same at first > > > glance. > > > > > > -- > > > Tom > > > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > > to be adjusted by size of boot sector, as is in this patch: > > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > > > So I just sent patch in current form which simplify definitions of > > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, > one file), remove it from CONFIG space, make it file local, and > FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm > taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and > what needs to be just something else, and what can be cleaned up / > removed, so I really want to figure out a solution here that migrates > the symbols or removes them from CONFIG namespace. > > -- > Tom More than month ago I proposed different solution, prepare codebase to completely drop CONFIG_SYS_MMC_U_BOOT_OFFS option. But nobody reacted to it and now I see on patchwork just "Changes Requested". https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-2-pali@kernel.org/ So I'm not going to invest more time to CONFIG_SYS_MMC_U_BOOT_OFFS as I see that there is no interested in it... ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:34 ` Pali Rohár @ 2022-06-28 18:39 ` Tom Rini 2022-06-28 18:41 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Tom Rini @ 2022-06-28 18:39 UTC (permalink / raw) To: Pali Rohár; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot [-- Attachment #1: Type: text/plain, Size: 4111 bytes --] On Tue, Jun 28, 2022 at 08:34:47PM +0200, Pali Rohár wrote: > On Tuesday 28 June 2022 14:28:52 Tom Rini wrote: > > On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > > > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > No functional change. > > > > > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > > > --- > > > > > Changes in v2: > > > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > > > --- > > > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > > > --- a/include/configs/p1_p2_rdb_pc.h > > > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > > > @@ -78,15 +78,15 @@ > > > > > > > > > > #ifdef CONFIG_SDCARD > > > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > #elif defined(CONFIG_SPIFLASH) > > > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > > > #ifdef CONFIG_TPL_BUILD > > > > > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > > > them to Kconfig, and use default xxx as you're changing them to above? > > > > The other platforms using this look to be doing the same at first > > > > glance. > > > > > > > > -- > > > > Tom > > > > > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > > > to be adjusted by size of boot sector, as is in this patch: > > > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > > > > > So I just sent patch in current form which simplify definitions of > > > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, > > one file), remove it from CONFIG space, make it file local, and > > FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm > > taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and > > what needs to be just something else, and what can be cleaned up / > > removed, so I really want to figure out a solution here that migrates > > the symbols or removes them from CONFIG namespace. > > > > -- > > Tom > > More than month ago I proposed different solution, prepare codebase to > completely drop CONFIG_SYS_MMC_U_BOOT_OFFS option. But nobody reacted to > it and now I see on patchwork just "Changes Requested". > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-2-pali@kernel.org/ Er, I see https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-1-pali@kernel.org/ notes it fails to build, so that's probably the changes requested. -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:39 ` Tom Rini @ 2022-06-28 18:41 ` Pali Rohár 2022-06-28 18:53 ` Tom Rini 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-06-28 18:41 UTC (permalink / raw) To: Tom Rini; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot On Tuesday 28 June 2022 14:39:11 Tom Rini wrote: > On Tue, Jun 28, 2022 at 08:34:47PM +0200, Pali Rohár wrote: > > On Tuesday 28 June 2022 14:28:52 Tom Rini wrote: > > > On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > > > > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > > > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > > > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > > > No functional change. > > > > > > > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > > > > --- > > > > > > Changes in v2: > > > > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > > > > --- > > > > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > > > > --- a/include/configs/p1_p2_rdb_pc.h > > > > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > > > > @@ -78,15 +78,15 @@ > > > > > > > > > > > > #ifdef CONFIG_SDCARD > > > > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > #elif defined(CONFIG_SPIFLASH) > > > > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > > > > #ifdef CONFIG_TPL_BUILD > > > > > > > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > > > > them to Kconfig, and use default xxx as you're changing them to above? > > > > > The other platforms using this look to be doing the same at first > > > > > glance. > > > > > > > > > > -- > > > > > Tom > > > > > > > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > > > > to be adjusted by size of boot sector, as is in this patch: > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > > > > > > > So I just sent patch in current form which simplify definitions of > > > > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, > > > one file), remove it from CONFIG space, make it file local, and > > > FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm > > > taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and > > > what needs to be just something else, and what can be cleaned up / > > > removed, so I really want to figure out a solution here that migrates > > > the symbols or removes them from CONFIG namespace. > > > > > > -- > > > Tom > > > > More than month ago I proposed different solution, prepare codebase to > > completely drop CONFIG_SYS_MMC_U_BOOT_OFFS option. But nobody reacted to > > it and now I see on patchwork just "Changes Requested". > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-2-pali@kernel.org/ > > Er, I see > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-1-pali@kernel.org/ > notes it fails to build, so that's probably the changes requested. > > -- > Tom V2 for that build failure already exists and half hour ago I sent another reminder for v2: https://lore.kernel.org/u-boot/20220628181436.iwmwvvoithgwp6pu@pali/ but it has nothing with CONFIG_SYS_MMC_U_BOOT_OFFS... ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:41 ` Pali Rohár @ 2022-06-28 18:53 ` Tom Rini 2022-06-28 18:58 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Tom Rini @ 2022-06-28 18:53 UTC (permalink / raw) To: Pali Rohár; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot [-- Attachment #1: Type: text/plain, Size: 4969 bytes --] On Tue, Jun 28, 2022 at 08:41:44PM +0200, Pali Rohár wrote: > On Tuesday 28 June 2022 14:39:11 Tom Rini wrote: > > On Tue, Jun 28, 2022 at 08:34:47PM +0200, Pali Rohár wrote: > > > On Tuesday 28 June 2022 14:28:52 Tom Rini wrote: > > > > On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > > > > > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > > > > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > > > > > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > > > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > > > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > > > > > No functional change. > > > > > > > > > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > > > > > --- > > > > > > > Changes in v2: > > > > > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > > > > > --- > > > > > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > > > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > > > > > --- a/include/configs/p1_p2_rdb_pc.h > > > > > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > > > > > @@ -78,15 +78,15 @@ > > > > > > > > > > > > > > #ifdef CONFIG_SDCARD > > > > > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > #elif defined(CONFIG_SPIFLASH) > > > > > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > > > > > #ifdef CONFIG_TPL_BUILD > > > > > > > > > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > > > > > them to Kconfig, and use default xxx as you're changing them to above? > > > > > > The other platforms using this look to be doing the same at first > > > > > > glance. > > > > > > > > > > > > -- > > > > > > Tom > > > > > > > > > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > > > > > to be adjusted by size of boot sector, as is in this patch: > > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > > > > > > > > > So I just sent patch in current form which simplify definitions of > > > > > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, > > > > one file), remove it from CONFIG space, make it file local, and > > > > FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm > > > > taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and > > > > what needs to be just something else, and what can be cleaned up / > > > > removed, so I really want to figure out a solution here that migrates > > > > the symbols or removes them from CONFIG namespace. > > > > > > > > -- > > > > Tom > > > > > > More than month ago I proposed different solution, prepare codebase to > > > completely drop CONFIG_SYS_MMC_U_BOOT_OFFS option. But nobody reacted to > > > it and now I see on patchwork just "Changes Requested". > > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-2-pali@kernel.org/ > > > > Er, I see > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-1-pali@kernel.org/ > > notes it fails to build, so that's probably the changes requested. > > > > -- > > Tom > > V2 for that build failure already exists and half hour ago I sent > another reminder for v2: > https://lore.kernel.org/u-boot/20220628181436.iwmwvvoithgwp6pu@pali/ > but it has nothing with CONFIG_SYS_MMC_U_BOOT_OFFS... Patch 1/3 in the series causes fails to build errors, the whole series gets changes requested, that's normal to me and expecting the whole series to be reposted. -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:53 ` Tom Rini @ 2022-06-28 18:58 ` Pali Rohár 2022-06-28 19:08 ` Tom Rini 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-06-28 18:58 UTC (permalink / raw) To: Tom Rini; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot On Tuesday 28 June 2022 14:53:26 Tom Rini wrote: > On Tue, Jun 28, 2022 at 08:41:44PM +0200, Pali Rohár wrote: > > On Tuesday 28 June 2022 14:39:11 Tom Rini wrote: > > > On Tue, Jun 28, 2022 at 08:34:47PM +0200, Pali Rohár wrote: > > > > On Tuesday 28 June 2022 14:28:52 Tom Rini wrote: > > > > > On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > > > > > > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > > > > > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > > > > > > > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > > > > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > > > > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > > > > > > > No functional change. > > > > > > > > > > > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > > > > > > --- > > > > > > > > Changes in v2: > > > > > > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > > > > > > --- > > > > > > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > > > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > > > > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > > > > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > > > > > > --- a/include/configs/p1_p2_rdb_pc.h > > > > > > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > > > > > > @@ -78,15 +78,15 @@ > > > > > > > > > > > > > > > > #ifdef CONFIG_SDCARD > > > > > > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > > #elif defined(CONFIG_SPIFLASH) > > > > > > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > > > > > > #ifdef CONFIG_TPL_BUILD > > > > > > > > > > > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > > > > > > them to Kconfig, and use default xxx as you're changing them to above? > > > > > > > The other platforms using this look to be doing the same at first > > > > > > > glance. > > > > > > > > > > > > > > -- > > > > > > > Tom > > > > > > > > > > > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > > > > > > to be adjusted by size of boot sector, as is in this patch: > > > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > > > > > > > > > > > So I just sent patch in current form which simplify definitions of > > > > > > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, > > > > > one file), remove it from CONFIG space, make it file local, and > > > > > FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm > > > > > taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and > > > > > what needs to be just something else, and what can be cleaned up / > > > > > removed, so I really want to figure out a solution here that migrates > > > > > the symbols or removes them from CONFIG namespace. > > > > > > > > > > -- > > > > > Tom > > > > > > > > More than month ago I proposed different solution, prepare codebase to > > > > completely drop CONFIG_SYS_MMC_U_BOOT_OFFS option. But nobody reacted to > > > > it and now I see on patchwork just "Changes Requested". > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-2-pali@kernel.org/ > > > > > > Er, I see > > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-1-pali@kernel.org/ > > > notes it fails to build, so that's probably the changes requested. > > > > > > -- > > > Tom > > > > V2 for that build failure already exists and half hour ago I sent > > another reminder for v2: > > https://lore.kernel.org/u-boot/20220628181436.iwmwvvoithgwp6pu@pali/ > > but it has nothing with CONFIG_SYS_MMC_U_BOOT_OFFS... > > Patch 1/3 in the series causes fails to build errors, the whole series > gets changes requested, that's normal to me and expecting the whole > series to be reposted. > > -- > Tom See the previous link. I have already rebased and resent first patch as v2. ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 18:58 ` Pali Rohár @ 2022-06-28 19:08 ` Tom Rini 2022-06-28 19:13 ` Pali Rohár 0 siblings, 1 reply; 39+ messages in thread From: Tom Rini @ 2022-06-28 19:08 UTC (permalink / raw) To: Pali Rohár; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot [-- Attachment #1: Type: text/plain, Size: 6029 bytes --] On Tue, Jun 28, 2022 at 08:58:48PM +0200, Pali Rohár wrote: > On Tuesday 28 June 2022 14:53:26 Tom Rini wrote: > > On Tue, Jun 28, 2022 at 08:41:44PM +0200, Pali Rohár wrote: > > > On Tuesday 28 June 2022 14:39:11 Tom Rini wrote: > > > > On Tue, Jun 28, 2022 at 08:34:47PM +0200, Pali Rohár wrote: > > > > > On Tuesday 28 June 2022 14:28:52 Tom Rini wrote: > > > > > > On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > > > > > > > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > > > > > > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > > > > > > > > > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > > > > > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > > > > > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > > > > > > > > > No functional change. > > > > > > > > > > > > > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > > > > > > > --- > > > > > > > > > Changes in v2: > > > > > > > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > > > > > > > --- > > > > > > > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > > > > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > > > > > > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > > > > > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > > > > > > > --- a/include/configs/p1_p2_rdb_pc.h > > > > > > > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > > > > > > > @@ -78,15 +78,15 @@ > > > > > > > > > > > > > > > > > > #ifdef CONFIG_SDCARD > > > > > > > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > > > #elif defined(CONFIG_SPIFLASH) > > > > > > > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > > > > > > > #ifdef CONFIG_TPL_BUILD > > > > > > > > > > > > > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > > > > > > > them to Kconfig, and use default xxx as you're changing them to above? > > > > > > > > The other platforms using this look to be doing the same at first > > > > > > > > glance. > > > > > > > > > > > > > > > > -- > > > > > > > > Tom > > > > > > > > > > > > > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > > > > > > > to be adjusted by size of boot sector, as is in this patch: > > > > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > > > > > > > > > > > > > So I just sent patch in current form which simplify definitions of > > > > > > > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > > > Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, > > > > > > one file), remove it from CONFIG space, make it file local, and > > > > > > FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm > > > > > > taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and > > > > > > what needs to be just something else, and what can be cleaned up / > > > > > > removed, so I really want to figure out a solution here that migrates > > > > > > the symbols or removes them from CONFIG namespace. > > > > > > > > > > > > -- > > > > > > Tom > > > > > > > > > > More than month ago I proposed different solution, prepare codebase to > > > > > completely drop CONFIG_SYS_MMC_U_BOOT_OFFS option. But nobody reacted to > > > > > it and now I see on patchwork just "Changes Requested". > > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-2-pali@kernel.org/ > > > > > > > > Er, I see > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-1-pali@kernel.org/ > > > > notes it fails to build, so that's probably the changes requested. > > > > > > > > -- > > > > Tom > > > > > > V2 for that build failure already exists and half hour ago I sent > > > another reminder for v2: > > > https://lore.kernel.org/u-boot/20220628181436.iwmwvvoithgwp6pu@pali/ > > > but it has nothing with CONFIG_SYS_MMC_U_BOOT_OFFS... > > > > Patch 1/3 in the series causes fails to build errors, the whole series > > gets changes requested, that's normal to me and expecting the whole > > series to be reposted. > > See the previous link. I have already rebased and resent first patch as v2. Yes, that's my point. You should have resent the whole series, not just that first patch. Why? Well, this feels like we're getting back to the state much of the N900 patches got to where it was really hard for Lokesh, or myself, to figure out the correct order to apply N patches in, with some of them having been reposted / rebased and others depending on those patches. The v2 you link above isn't "v2 1/3", but just "v2". So, reposting the whole series is preferred. -- Tom [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 659 bytes --] ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros 2022-06-28 19:08 ` Tom Rini @ 2022-06-28 19:13 ` Pali Rohár 0 siblings, 0 replies; 39+ messages in thread From: Pali Rohár @ 2022-06-28 19:13 UTC (permalink / raw) To: Tom Rini; +Cc: Priyanka Jain, Peng Fan (OSS), u-boot On Tuesday 28 June 2022 15:08:57 Tom Rini wrote: > On Tue, Jun 28, 2022 at 08:58:48PM +0200, Pali Rohár wrote: > > On Tuesday 28 June 2022 14:53:26 Tom Rini wrote: > > > On Tue, Jun 28, 2022 at 08:41:44PM +0200, Pali Rohár wrote: > > > > On Tuesday 28 June 2022 14:39:11 Tom Rini wrote: > > > > > On Tue, Jun 28, 2022 at 08:34:47PM +0200, Pali Rohár wrote: > > > > > > On Tuesday 28 June 2022 14:28:52 Tom Rini wrote: > > > > > > > On Tue, Jun 28, 2022 at 08:22:38PM +0200, Pali Rohár wrote: > > > > > > > > On Tuesday 28 June 2022 14:17:42 Tom Rini wrote: > > > > > > > > > On Tue, Jun 28, 2022 at 07:53:55PM +0200, Pali Rohár wrote: > > > > > > > > > > > > > > > > > > > Now when CONFIG_SYS_TEXT_BASE has sane value, use it for calculation of > > > > > > > > > > other SPL offset values: CONFIG_SPL_MAX_SIZE, CONFIG_SYS_MMC_U_BOOT_* and > > > > > > > > > > CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > > > > > > > > > > > No functional change. > > > > > > > > > > > > > > > > > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > > > > > > > > > --- > > > > > > > > > > Changes in v2: > > > > > > > > > > * Rebased on top of the U-Boot next branch, commit d61c11b8c894fad517677dc51ee82d1eade39c01 > > > > > > > > > > --- > > > > > > > > > > include/configs/p1_p2_rdb_pc.h | 12 ++++++------ > > > > > > > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > > > > > > > > > > > > > > > > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > > > > > > > > > index 56a16502dcc7..7237e3c1a63c 100644 > > > > > > > > > > --- a/include/configs/p1_p2_rdb_pc.h > > > > > > > > > > +++ b/include/configs/p1_p2_rdb_pc.h > > > > > > > > > > @@ -78,15 +78,15 @@ > > > > > > > > > > > > > > > > > > > > #ifdef CONFIG_SDCARD > > > > > > > > > > #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) > > > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000) > > > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) > > > > > > > > > > -#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10) > > > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > > > > +#define CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > > > > #elif defined(CONFIG_SPIFLASH) > > > > > > > > > > #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) > > > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000) > > > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) > > > > > > > > > > -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10) > > > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE > > > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE > > > > > > > > > > +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO > > > > > > > > > > #define CONFIG_SYS_MPC85XX_NO_RESETVEC > > > > > > > > > > #elif defined(CONFIG_MTD_RAW_NAND) > > > > > > > > > > #ifdef CONFIG_TPL_BUILD > > > > > > > > > > > > > > > > > > So, this is entirely a PowerPC spl set of CONFIG variables. Can we move > > > > > > > > > them to Kconfig, and use default xxx as you're changing them to above? > > > > > > > > > The other platforms using this look to be doing the same at first > > > > > > > > > glance. > > > > > > > > > > > > > > > > > > -- > > > > > > > > > Tom > > > > > > > > > > > > > > > > Not sure how to do it right now. CONFIG_SYS_MMC_U_BOOT_OFFS would need > > > > > > > > to be adjusted by size of boot sector, as is in this patch: > > > > > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220405134032.704-3-pali@kernel.org/ > > > > > > > > > > > > > > > > So I just sent patch in current form which simplify definitions of > > > > > > > > CONFIG_SYS_MMC_U_BOOT_* and CONFIG_SYS_SPI_FLASH_U_BOOT_* macros. > > > > > > > > > > > > > > Given the limited places we use CONFIG_SYS_MMC_U_BOOT_OFFS (two spots, > > > > > > > one file), remove it from CONFIG space, make it file local, and > > > > > > > FSL_PREPBL_ESDHC_BOOT_SECTOR will be in Kconfig to start with? I'm > > > > > > > taking a harder look at what CONFIG_SYS_* can be moved to Kconfig, and > > > > > > > what needs to be just something else, and what can be cleaned up / > > > > > > > removed, so I really want to figure out a solution here that migrates > > > > > > > the symbols or removes them from CONFIG namespace. > > > > > > > > > > > > > > -- > > > > > > > Tom > > > > > > > > > > > > More than month ago I proposed different solution, prepare codebase to > > > > > > completely drop CONFIG_SYS_MMC_U_BOOT_OFFS option. But nobody reacted to > > > > > > it and now I see on patchwork just "Changes Requested". > > > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-2-pali@kernel.org/ > > > > > > > > > > Er, I see > > > > > https://patchwork.ozlabs.org/project/uboot/patch/20220511183332.1362-1-pali@kernel.org/ > > > > > notes it fails to build, so that's probably the changes requested. > > > > > > > > > > -- > > > > > Tom > > > > > > > > V2 for that build failure already exists and half hour ago I sent > > > > another reminder for v2: > > > > https://lore.kernel.org/u-boot/20220628181436.iwmwvvoithgwp6pu@pali/ > > > > but it has nothing with CONFIG_SYS_MMC_U_BOOT_OFFS... > > > > > > Patch 1/3 in the series causes fails to build errors, the whole series > > > gets changes requested, that's normal to me and expecting the whole > > > series to be reposted. > > > > See the previous link. I have already rebased and resent first patch as v2. > > Yes, that's my point. You should have resent the whole series, not just > that first patch. Why? Well, this feels like we're getting back to the > state much of the N900 patches got to where it was really hard for > Lokesh, or myself, to figure out the correct order to apply N patches > in, with some of them having been reposted / rebased and others > depending on those patches. The v2 you link above isn't "v2 1/3", but > just "v2". So, reposting the whole series is preferred. > > -- > Tom Well, for last month, I'm just asked to rebase and rebase patches. I really do not want to do another useless job (= rebase patch which would be needed to rebase again in next moth). And so I'm not going to rebase & send whole patch series which take me lot of time. So I in this case I just rebased and resent only the first patch from that patch series and once it will be processed and I will look at other patches, one by one. ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár ` (7 preceding siblings ...) 2022-04-05 13:12 ` [PATCH 8/8] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros Pali Rohár @ 2022-04-05 17:03 ` Sinan Akman 2022-04-05 17:17 ` Pali Rohár 8 siblings, 1 reply; 39+ messages in thread From: Sinan Akman @ 2022-04-05 17:03 UTC (permalink / raw) To: Pali Rohár, Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk Cc: u-boot Hi Pali On 2022-04-05 9:12 a.m., Pali Rohár wrote: > This patch series fixes support for CONFIG_OF_SEPARATE option, cleanup > linker scripts and change code so TEXT_BASE address is set o expected value. > > Tested on P2020 based board. > > Pali Rohár (8): > powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support > powerpc: mpc85xx: Remove duplicate u-boot-nand.lds > powerpc: mpc85xx: Remove u-boot-nand_spl.lds > powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld > script > powerpc: mpc85xx: Put bss after image when not including reset vector > powerpc: mpc85xx: Define linker sections in ascending order > powerpc: mpc85xx: Set TEXT_BASE addresses to real base values > board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros > > arch/powerpc/cpu/mpc85xx/start.S | 4 +- > arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 97 -------------------- > arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 68 -------------- > arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 25 ++--- > arch/powerpc/cpu/mpc85xx/u-boot.lds | 37 +++----- > 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 | 4 +- > configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +- > configs/P1020RDB-PC_NAND_defconfig | 6 +- > configs/P1020RDB-PC_SDCARD_defconfig | 4 +- > configs/P1020RDB-PC_SPIFLASH_defconfig | 4 +- > configs/P1020RDB-PD_NAND_defconfig | 6 +- > configs/P1020RDB-PD_SDCARD_defconfig | 4 +- > configs/P1020RDB-PD_SPIFLASH_defconfig | 4 +- > configs/P2020RDB-PC_36BIT_NAND_defconfig | 6 +- > configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 4 +- > configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +- > configs/P2020RDB-PC_NAND_defconfig | 6 +- > configs/P2020RDB-PC_SDCARD_defconfig | 4 +- > configs/P2020RDB-PC_SPIFLASH_defconfig | 4 +- Just a quick question here. Do you changes not apply to P2041 ? Best regards Sinan Akman > configs/T1024RDB_NAND_defconfig | 4 +- > configs/T1024RDB_SDCARD_defconfig | 2 +- > configs/T1024RDB_SPIFLASH_defconfig | 2 +- > configs/T1042D4RDB_NAND_defconfig | 4 +- > configs/T1042D4RDB_SDCARD_defconfig | 2 +- > configs/T1042D4RDB_SPIFLASH_defconfig | 2 +- > configs/T2080QDS_NAND_defconfig | 4 +- > configs/T2080QDS_SDCARD_defconfig | 2 +- > configs/T2080QDS_SPIFLASH_defconfig | 2 +- > configs/T2080RDB_NAND_defconfig | 4 +- > configs/T2080RDB_SDCARD_defconfig | 2 +- > configs/T2080RDB_SPIFLASH_defconfig | 2 +- > configs/T2080RDB_revD_NAND_defconfig | 4 +- > configs/T2080RDB_revD_SDCARD_defconfig | 2 +- > configs/T2080RDB_revD_SPIFLASH_defconfig | 2 +- > configs/T4240RDB_SDCARD_defconfig | 2 +- > configs/qemu-ppce500_defconfig | 2 +- > include/configs/P1010RDB.h | 10 +- > include/configs/T102xRDB.h | 3 + > include/configs/T104xRDB.h | 3 + > include/configs/T208xQDS.h | 3 + > include/configs/T208xRDB.h | 3 + > include/configs/p1_p2_rdb_pc.h | 26 +++--- > 55 files changed, 127 insertions(+), 322 deletions(-) > delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds > delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds > ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code 2022-04-05 17:03 ` [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Sinan Akman @ 2022-04-05 17:17 ` Pali Rohár 2022-04-05 18:10 ` Sinan Akman 0 siblings, 1 reply; 39+ messages in thread From: Pali Rohár @ 2022-04-05 17:17 UTC (permalink / raw) To: Sinan Akman Cc: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, u-boot On Tuesday 05 April 2022 13:03:15 Sinan Akman wrote: > > Hi Pali > > On 2022-04-05 9:12 a.m., Pali Rohár wrote: > > This patch series fixes support for CONFIG_OF_SEPARATE option, cleanup > > linker scripts and change code so TEXT_BASE address is set o expected value. > > > > Tested on P2020 based board. > > > > Pali Rohár (8): > > powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support > > powerpc: mpc85xx: Remove duplicate u-boot-nand.lds > > powerpc: mpc85xx: Remove u-boot-nand_spl.lds > > powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld > > script > > powerpc: mpc85xx: Put bss after image when not including reset vector > > powerpc: mpc85xx: Define linker sections in ascending order > > powerpc: mpc85xx: Set TEXT_BASE addresses to real base values > > board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros > > > > arch/powerpc/cpu/mpc85xx/start.S | 4 +- > > arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 97 -------------------- > > arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 68 -------------- > > arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 25 ++--- > > arch/powerpc/cpu/mpc85xx/u-boot.lds | 37 +++----- > > 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 | 4 +- > > configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +- > > configs/P1020RDB-PC_NAND_defconfig | 6 +- > > configs/P1020RDB-PC_SDCARD_defconfig | 4 +- > > configs/P1020RDB-PC_SPIFLASH_defconfig | 4 +- > > configs/P1020RDB-PD_NAND_defconfig | 6 +- > > configs/P1020RDB-PD_SDCARD_defconfig | 4 +- > > configs/P1020RDB-PD_SPIFLASH_defconfig | 4 +- > > configs/P2020RDB-PC_36BIT_NAND_defconfig | 6 +- > > configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 4 +- > > configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 4 +- > > configs/P2020RDB-PC_NAND_defconfig | 6 +- > > configs/P2020RDB-PC_SDCARD_defconfig | 4 +- > > configs/P2020RDB-PC_SPIFLASH_defconfig | 4 +- > > Just a quick question here. Do you changes not apply to > P2041 ? Hello! I looked at mpc85xx boards which have +0x1000 in its base addresses and modified them. P2041RDB_defconfig, P2041RDB_NAND_defconfig, P2041RDB_SDCARD_defconfig and P2041RDB_SPIFLASH_defconfig do not have +0x1000 in base addresses. So I'm not sure how are P2041 compiled and what is layout of its address space. Maybe P2041 needs some other changes? And it is working with mainline U-Boot? Do you or somebody else has a chance to test this patch series on some P2041 board? > Best regards > Sinan Akman > > > configs/T1024RDB_NAND_defconfig | 4 +- > > configs/T1024RDB_SDCARD_defconfig | 2 +- > > configs/T1024RDB_SPIFLASH_defconfig | 2 +- > > configs/T1042D4RDB_NAND_defconfig | 4 +- > > configs/T1042D4RDB_SDCARD_defconfig | 2 +- > > configs/T1042D4RDB_SPIFLASH_defconfig | 2 +- > > configs/T2080QDS_NAND_defconfig | 4 +- > > configs/T2080QDS_SDCARD_defconfig | 2 +- > > configs/T2080QDS_SPIFLASH_defconfig | 2 +- > > configs/T2080RDB_NAND_defconfig | 4 +- > > configs/T2080RDB_SDCARD_defconfig | 2 +- > > configs/T2080RDB_SPIFLASH_defconfig | 2 +- > > configs/T2080RDB_revD_NAND_defconfig | 4 +- > > configs/T2080RDB_revD_SDCARD_defconfig | 2 +- > > configs/T2080RDB_revD_SPIFLASH_defconfig | 2 +- > > configs/T4240RDB_SDCARD_defconfig | 2 +- > > configs/qemu-ppce500_defconfig | 2 +- > > include/configs/P1010RDB.h | 10 +- > > include/configs/T102xRDB.h | 3 + > > include/configs/T104xRDB.h | 3 + > > include/configs/T208xQDS.h | 3 + > > include/configs/T208xRDB.h | 3 + > > include/configs/p1_p2_rdb_pc.h | 26 +++--- > > 55 files changed, 127 insertions(+), 322 deletions(-) > > delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds > > delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds > > > ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code 2022-04-05 17:17 ` Pali Rohár @ 2022-04-05 18:10 ` Sinan Akman 0 siblings, 0 replies; 39+ messages in thread From: Sinan Akman @ 2022-04-05 18:10 UTC (permalink / raw) To: Pali Rohár Cc: Priyanka Jain, Qiang Zhao, Shengzhou Liu, Alexander Graf, Bin Meng, Wolfgang Denk, u-boot Hi Pali On 2022-04-05 1:17 p.m., Pali Rohár wrote: > On Tuesday 05 April 2022 13:03:15 Sinan Akman wrote: >> Hi Pali >> >> On 2022-04-05 9:12 a.m., Pali Rohár wrote: >> [...] >> Just a quick question here. Do you changes not apply to >> P2041 ? > Hello! I looked at mpc85xx boards which have +0x1000 in its base > addresses and modified them. > > P2041RDB_defconfig, P2041RDB_NAND_defconfig, P2041RDB_SDCARD_defconfig > and P2041RDB_SPIFLASH_defconfig do not have +0x1000 in base addresses. > > So I'm not sure how are P2041 compiled and what is layout of its address > space. Maybe P2041 needs some other changes? And it is working with > mainline U-Boot? > > Do you or somebody else has a chance to test this patch series on some > P2041 board? > I do have a P2040 RDB as well as a P2020 RDB board but unfortunately I will be away from the boards and the earliest I can test this will be around mid-May. Hopefully someone else can test your patches but if not and if it is not too late for you I will test them around that time. I can then also work on P2040 patches if necessary. Best regards Sinan Akman ^ permalink raw reply [flat|nested] 39+ messages in thread
end of thread, other threads:[~2022-06-28 19:14 UTC | newest] Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-04-05 13:12 [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Pali Rohár 2022-04-05 13:12 ` [PATCH 1/8] powerpc: mpc85xx: Fix CONFIG_OF_SEPARATE support Pali Rohár 2022-04-08 11:04 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 2/8] powerpc: mpc85xx: Remove duplicate u-boot-nand.lds Pali Rohár 2022-04-05 13:12 ` [PATCH 3/8] powerpc: mpc85xx: Remove u-boot-nand_spl.lds Pali Rohár 2022-04-05 13:12 ` [PATCH 4/8] powerpc: mpc85xx: Remove useless SIZEOF_HEADERS and .interp from ld script Pali Rohár 2022-04-05 13:12 ` [PATCH 5/8] powerpc: mpc85xx: Put bss after image when not including reset vector Pali Rohár 2022-04-05 13:12 ` [PATCH 6/8] powerpc: mpc85xx: Define linker sections in ascending order Pali Rohár 2022-04-05 13:12 ` [PATCH 7/8] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values Pali Rohár 2022-04-25 4:27 ` Priyanka Jain (OSS) 2022-04-25 12:31 ` Pali Rohár 2022-05-11 18:59 ` Pali Rohár 2022-05-18 10:51 ` Pali Rohár 2022-06-04 13:01 ` Pali Rohár 2022-04-25 12:29 ` [PATCH v2] " Pali Rohár 2022-06-16 8:57 ` Peng Fan (OSS) 2022-06-16 9:30 ` Pali Rohár 2022-06-16 12:19 ` [PATCH v3] " Pali Rohár 2022-06-23 11:29 ` Pali Rohár 2022-06-23 12:34 ` Tom Rini 2022-06-28 9:18 ` Pali Rohár 2022-06-28 13:42 ` Tom Rini 2022-06-28 14:52 ` Tom Rini 2022-06-28 17:43 ` Pali Rohár 2022-04-05 13:12 ` [PATCH 8/8] board: freescale: p1_p2_rdb_pc: Simplify SPL offset macros Pali Rohár 2022-06-28 17:53 ` [PATCH v2] " Pali Rohár 2022-06-28 18:17 ` Tom Rini 2022-06-28 18:22 ` Pali Rohár 2022-06-28 18:28 ` Tom Rini 2022-06-28 18:34 ` Pali Rohár 2022-06-28 18:39 ` Tom Rini 2022-06-28 18:41 ` Pali Rohár 2022-06-28 18:53 ` Tom Rini 2022-06-28 18:58 ` Pali Rohár 2022-06-28 19:08 ` Tom Rini 2022-06-28 19:13 ` Pali Rohár 2022-04-05 17:03 ` [PATCH 0/8] powerpc: mpc85xx: Fix and cleanup mpc85xx code Sinan Akman 2022-04-05 17:17 ` Pali Rohár 2022-04-05 18:10 ` Sinan Akman
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.