diff options
author | Tom Rini <trini@konsulko.com> | 2022-06-28 10:52:00 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-06-28 10:52:00 -0400 |
commit | d61c11b8c894fad517677dc51ee82d1eade39c01 (patch) | |
tree | 519bfe66413efdc0d6c95150261c8dd8cc16dd1f /configs/P1010RDB-PA_NAND_defconfig | |
parent | ea82ed8c2eaee0a0f7dee31016aaee4ce88e9ea7 (diff) | |
parent | f6810b749f2ec136dac02989b23e7c5730c4e1a7 (diff) | |
download | u-boot-d61c11b8c894fad517677dc51ee82d1eade39c01.tar.gz |
Merge branch '2022-06-28-mpc85xx-and-aspeed-fixes' into next
- Merge a PowerPC MPC85xx cleanup / fix, and aspeed linker fix
Diffstat (limited to 'configs/P1010RDB-PA_NAND_defconfig')
-rw-r--r-- | configs/P1010RDB-PA_NAND_defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig index 15c7e993b9..6dd81bb7d0 100644 --- a/configs/P1010RDB-PA_NAND_defconfig +++ b/configs/P1010RDB-PA_NAND_defconfig @@ -1,12 +1,12 @@ CONFIG_PPC=y -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 @@ -18,7 +18,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" @@ -34,7 +34,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 |