Convert CONFIG_SPL_GD_ADDR to Kconfig

This converts the following to Kconfig:
   CONFIG_SPL_GD_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index a78a9143a01d6f0a1880766808191d971ee71047..88695002deb5bdaabcb89731ae4ecc36b03a6126 100644 (file)
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -63,11 +63,11 @@ void board_init_f(ulong bootflag)
 void board_init_r(gd_t *gd, ulong dest_addr)
 {
        /* Pointer is writable since we allocated a register for it */
-       gd = (gd_t *)CONFIG_SPL_GD_ADDR;
+       gd = (gd_t *)CONFIG_VAL(GD_ADDR);
        struct bd_info *bd;
 
        memset(gd, 0, sizeof(gd_t));
-       bd = (struct bd_info *)(CONFIG_SPL_GD_ADDR + sizeof(gd_t));
+       bd = (struct bd_info *)(CONFIG_VAL(GD_ADDR) + sizeof(gd_t));
        memset(bd, 0, sizeof(struct bd_info));
        gd->bd = bd;
 

diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 580972d800a7165f1d87e6b15550337080d14ab3..b60027ebd9ab9c56932d0ee0223704d3bfa9b143 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -69,11 +69,11 @@ void board_init_f(ulong bootflag)
 void board_init_r(gd_t *gd, ulong dest_addr)
 {
        /* Pointer is writable since we allocated a register for it */
-       gd = (gd_t *)CONFIG_SPL_GD_ADDR;
+       gd = (gd_t *)CONFIG_VAL(GD_ADDR);
        struct bd_info *bd;
 
        memset(gd, 0, sizeof(gd_t));
-       bd = (struct bd_info *)(CONFIG_SPL_GD_ADDR + sizeof(gd_t));
+       bd = (struct bd_info *)(CONFIG_VAL(GD_ADDR) + sizeof(gd_t));
        memset(bd, 0, sizeof(struct bd_info));
        gd->bd = bd;
 

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 10d9cdd0c286d206d20d8887545d0d34f6a8fbe5..027ac4274b65c5c1b3f740e3bc6d1d8c3e3fae23 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -246,6 +246,10 @@ config SPL_FLUSH_IMAGE
 config SPL_SKIP_RELOCATE
        bool "Skip relocating SPL"
 
+config SPL_GD_ADDR
+       hex "Address to use for global data (gd) in SPL"
+       depends on !SPL_INIT_MINIMAL
+
 config SPL_RELOC_TEXT_BASE
        hex "Address to relocate SPL to"
        default SPL_TEXT_BASE
@@ -272,6 +276,10 @@ config SPL_RELOC_MALLOC_SIZE
        hex "Size of malloc pool in SPL"
        depends on SPL_RELOC_MALLOC
 
+config TPL_GD_ADDR
+       hex "Address to use for global data (gd) in TPL"
+       depends on TPL
+
 config TPL_RELOC_TEXT_BASE
        hex "Address to relocate TPL to"
        depends on TPL

diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index 22b43801a776e11387efbf12e445406b17a3dfa3..06b4ca72b21aefec53bca38498a0c237200c6d82 100644 (file)
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xd0030000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index 7406cb29b03f83c131273632dc187e2d9de16c6d..b116eee6c5c5a076cd9f1b50aed72d6d2e0bd6f7 100644 (file)
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -30,6 +30,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index 41b2f2f58b17a97d5c225cb52cdc31587625322c..df4caee9e72e78b75e9ff7dad5eeedd5a4c4ff11 100644 (file)
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -33,6 +33,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index 993a1f8d54a1ec2e04ddd86eacdf50011d65d8ad..918a107f52833aea7277a694cbe8005bf0b5fb7e 100644 (file)
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xd0030000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index 058c87d77b38923754ab8b51cad5039c8aa06ebc..41988bb1f72788981e54e592a2dbe56ec15c341e 100644 (file)
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -29,6 +29,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index 4c2d72605e2204640f3b35e050a76c253807aacf..b4dd81ea940420bc1944f4007f28dcaf2038467c 100644 (file)
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -32,6 +32,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index c38be8f14573c8b5d67f6b83f0aa72c2a490af36..b69e6cf565547534976288ea1e805e1b28aea13f 100644 (file)
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -36,6 +36,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xd0030000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index 9e788ab9bf3ab6d567ffc50e26f27d1269f19f89..21e4e7f0f5f8f46fdbc75c47ee40785e1c615b79 100644 (file)
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index a762f07c489b0360a9c044dbf6a1ab47d6b1b05b..dbbc25d319df73e7e02a89a376d864c0179d783a 100644 (file)
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 18ba32f2d1e2222d3e57210a3f444593c6ed4b29..c4e9d5900547a309a2ca7eb7604af868da6119f8 100644 (file)
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xd0030000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index 1d18f1282d11b9234892806f7b2994c92c50efbb..c0ea6b9635a9e7bd2511720776ef081b1e1e1212 100644 (file)
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -30,6 +30,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index 1a36d6c5133f535faad8ec80180f602919766146..c32ccc292b417d0f03c1bd5ffa138a97fc58ec32 100644 (file)
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -33,6 +33,7 @@ CONFIG_SPL_MAX_SIZE=0x18000
 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_STACK=0xd001c000
 CONFIG_SPL_RELOC_MALLOC=y

diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index 54cd3d2b5ccb5a23ae815edb1b8b310f208f7c8d..3e5c0449fd8abbda10d270eb780bcb1d55c10cd0 100644 (file)
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -36,6 +36,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xf8fb0000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 6a36f3ba9b27eb54e153a6cbb0677264f7560f0b..ddd041c09a5e7538978144007fc200d3683a236f 100644 (file)
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -32,6 +32,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_MMC_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index e246a2190d0c1b970df95429ecb81aee2564f2b0..9da02480e5e2f95cd508d0fcf9ac3b33aa2ed33c 100644 (file)
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_SPI_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index b49cdcb480dcfe1e50d773cfc107f4bf216bffc5..6a75d6f1e8131496962f5d2cfdf92691f1ef9bf8 100644 (file)
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xf8fb0000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index a86a406eb7c534afbb345abe2c1e31ac9851b3b7..4122d1d741ee991f25140b0821f75bbb9087b014 100644 (file)
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_MMC_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index 4c9f1b4c81ed03447c8dc0ec248b460d56fefd22..cfd42e4bf3ebc2d0c77ddb3f1616c3ffc06861d2 100644 (file)
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_SPI_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 899d074537fa58347e012877785f8a188f76c80d..bd3d7a3cbb05352fe3083e833199ea897aff2a72 100644 (file)
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xf8fb0000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index ea91b9e95d5db924ca42a399077e56b2fe29b03e..43391a99b1d24c01377dd53286b37019684c9c73 100644 (file)
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_MMC_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index 9351f00e5db598d025b0ac9aa782cfb2a01204c4..091518592c188b74a2230bf341a120ae7d1b54e5 100644 (file)
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_SPI_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index ad6c72c23c527ed56e9e303f119d6f3bc7451fb9..c0f6b6d8db4c658d222cdb6e328831a991c98c2d 100644 (file)
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -36,6 +36,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xf8fb0000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index d4f82f16f586a0ad74b49aa6b1a8902ab917d421..b17346fea34d2bf85898caf40abf06fc79fc90fd 100644 (file)
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -32,6 +32,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_MMC_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index 7a198e01785fa776b5a43d8bb44a7511663554cf..041179e07d36eb02a5c59bef50d7dd2cbf69c3f8 100644 (file)
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_SPI_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index f5bd7015fb543615d8415c766fb3a1db8fdef6b3..f3fa869c927f5991d19433a984621b045427a72d 100644 (file)
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_INIT_MINIMAL=y
 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_STACK=0xf8fb0000
 CONFIG_TPL_RELOC_MALLOC=y

diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index 0e1eb82a00eee1eba370f7228e7bf71fb5131915..ae4b758776ca75b2e56fbff0856beddbf7409bed 100644 (file)
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_MMC_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index 5ffda90dd3bfba374fc0c7f2f172d70c40ec524c..338bbecbb4b744f928e3c525db62236ab324d6cb 100644 (file)
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_SPI_BOOT=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
+CONFIG_SPL_GD_ADDR=0xf8f9c000
 CONFIG_SPL_RELOC_STACK=0xf8f9d000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xf8fa5000

diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 93dc0c1909f081142dc0c088aaea42411b84c588..2eb985823ec0c103ffb71f537182d74568e7a57d 100644 (file)
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -39,6 +39,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index dddf74262e35df3285a82b0368bc3f1f852559c5..9daf7fd5ef77f197a79bc0829a9a22e098d09f56 100644 (file)
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -40,6 +40,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index d8e41241ee6d855e27cf9f38841e5c2a0215a878..ee9292a4fb9fbeacf020ec97e2d77b3a6db55a17 100644 (file)
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -43,6 +43,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index ccb1a3343cad2389e444194379b750b23f962ca6..91a83007ce87880d78e98b26733183534fc4f02e 100644 (file)
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index 4b3962c7de8e697ada580f81ff69780552d932f7..32fed7a33a4aa9a5fc4f664e077947aa8cfaa71e 100644 (file)
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -36,6 +36,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index a9668c562de9dc645eb55d1f103f993107ef3d1e..638ed7147a728bf6189262a5857894d2138ff0fa 100644 (file)
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -39,6 +39,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index e8b83ed127deec3a56c8d5a6b083888df154f290..b71659a6600de029ed79b5ad71cf9193ce4f6caf 100644 (file)
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -40,6 +40,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index 1e9b58622658f93291d433e9efcbb110826a870f..1b8ef0cb365f2f261558a4fde3f4abb5f40bb148 100644 (file)
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index 2967c4e9806af16e68d4059520eba2a93a59b692..bcef31a665fc15c11af29ce68bd70d36a2b959fa 100644 (file)
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -44,6 +44,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index dd5a3dee4d82de9c440955604d10f1d7275fc099..9e8e3ea8b5af7db8ec7e5c0723a034d7c79f3c0f 100644 (file)
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -38,6 +38,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
index 2c35b80c0c6c12efea46f9c01a6df60b0bf77808..b6a0b857a725dfd8d616045a76f67ea56314da8a 100644 (file)
--- a/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@ -39,6 +39,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
index 21e0be3a03ac5aef608b8cd34cc3051ffb20af20..b0f0d165cdd2677d4161c6fb6ffa04979f996999 100644 (file)
--- a/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@ -42,6 +42,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig
index d2b8df2dbc1029c47d5e561b9c2c627edbfdeb42..feba8e54b5cb5c2892e59047eabf2ddcc1a36f44 100644 (file)
--- a/configs/T2080RDB_revD_NAND_defconfig
+++ b/configs/T2080RDB_revD_NAND_defconfig
@@ -39,6 +39,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080RDB_revD_SDCARD_defconfig b/configs/T2080RDB_revD_SDCARD_defconfig
index 24dea1ae9af6f2f96f3434d8775072980aff3ffc..0495786bc5f934413818fc946c81e11830c0a3ec 100644 (file)
--- a/configs/T2080RDB_revD_SDCARD_defconfig
+++ b/configs/T2080RDB_revD_SDCARD_defconfig
@@ -40,6 +40,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig
index a5c397dc4dd9f28755370d142146e4c1f1fc3dc9..bb7c711d55757d7c5578bd127e0fc2a14af2d515 100644 (file)
--- a/configs/T2080RDB_revD_SPIFLASH_defconfig
+++ b/configs/T2080RDB_revD_SPIFLASH_defconfig
@@ -43,6 +43,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index 56eb03b0c0299ac7fd131c3f10fb273c0c207aaa..fb35c83f1b6c10a85d6eb5a5aa3bae13828de7db 100644 (file)
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -37,6 +37,7 @@ CONFIG_SPL_FSL_PBL=y
 CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE=y
 CONFIG_SPL_FLUSH_IMAGE=y
 CONFIG_SPL_SKIP_RELOCATE=y
+CONFIG_SPL_GD_ADDR=0xfffc8000
 CONFIG_SPL_RELOC_STACK=0xfffd8000
 CONFIG_SPL_RELOC_MALLOC=y
 CONFIG_SPL_RELOC_MALLOC_ADDR=0xfffcb000

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 13f8360a5b48acae0582d0ef953e83f463ae6355..770f3963143df96416ac1137491dc16e371a9a5b 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -390,14 +390,12 @@ 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_GD_ADDR             (CONFIG_SYS_INIT_L2_ADDR + 96 * 1024)
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
 #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_GD_ADDR             (CONFIG_SYS_INIT_L2_ADDR + 176 * 1024)
 #else
 #define CONFIG_SYS_INIT_L2_ADDR                0xD0000000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 4dcd376d89547dc3a634c6cd8837ada02b93b72c..49654711f403fce5a5fd1dbd6ebcb92d65fc30e3 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -119,7 +119,6 @@
  */
 #define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
 #define CONFIG_SYS_L3_SIZE             (256 << 10)
-#define CONFIG_SPL_GD_ADDR             (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024)
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
 #ifdef CONFIG_PHYS_64BIT

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 07eed3bb14f34b78fee4d67c32e3a85b7d5332c0..a56e3bfb654e3a62dcb75fdfa835859e023e6fa9 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -106,7 +106,6 @@
  */
 #define CONFIG_SYS_INIT_L3_VADDR       0xFFFC0000
 #define CONFIG_SYS_L3_SIZE             256 << 10
-#define CONFIG_SPL_GD_ADDR             (CONFIG_SYS_INIT_L3_VADDR + 32 * 1024)
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
 #define CONFIG_SYS_DCSRBAR             0xf0000000

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 16751e5a3fb36408da055940d3f10925230c61c6..de81f53ec2c6f58e3c183fdcc1ff671f8555d7eb 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -92,7 +92,6 @@
  */
 #define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
 #define CONFIG_SYS_L3_SIZE             (512 << 10)
-#define CONFIG_SPL_GD_ADDR             (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024)
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
 #define CONFIG_SYS_DCSRBAR     0xf0000000

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index feec2c3599125f9fcb81a828cdeb260544a04be6..04562bfbbdff2adc710c2df6233b593bfa8d70ed 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -87,7 +87,6 @@
  */
 #define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
 #define CONFIG_SYS_L3_SIZE             (512 << 10)
-#define CONFIG_SPL_GD_ADDR             (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024)
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
 #define CONFIG_SYS_DCSRBAR     0xf0000000

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 21854139b9da5c652530b15ebb215e27172d2674..2ab1b647a86bfb454aea6fb531cfde52e3862e7c 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -67,7 +67,6 @@
  */
 #define CONFIG_SYS_INIT_L3_ADDR                0xFFFC0000
 #define CONFIG_SYS_L3_SIZE             (512 << 10)
-#define CONFIG_SPL_GD_ADDR             (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024)
 #define SPL_ENV_ADDR                   (CONFIG_SPL_GD_ADDR + 4 * 1024)
 
 #define CONFIG_SYS_DCSRBAR             0xf0000000

diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h
index 497f0d50d0aaf9db359e473c68ae16c13b7e3ca5..12bd8fb99cd610a19597e510b85d9d6b9833d434 100644 (file)
--- a/include/configs/openpiton-riscv64.h
+++ b/include/configs/openpiton-riscv64.h
@@ -17,10 +17,6 @@
 #define CONFIG_SYS_SDRAM_BASE 0x80000000
 #define CONFIG_SYS_BOOTM_LEN        SZ_256M
 
-#ifdef CONFIG_SPL
-#define CONFIG_SPL_GD_ADDR 0x85000000
-#endif
-
 /* ---------------------------------------------------------------------
  * Board boot configuration
  */

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 0b866f4d5a66813c831c1f78cc4f92cc11ac4e59..eb9c78bf77c39f6126b9add7d32d2f9703ebdb6a 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -336,13 +336,11 @@
 #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_GD_ADDR             (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024)
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #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_GD_ADDR             (CONFIG_SYS_INIT_L2_ADDR + 176 * 1024)
 #else
 #define CONFIG_SYS_INIT_L2_ADDR                0xf8f80000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS   CONFIG_SYS_INIT_L2_ADDR