]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
configs: Remove unneeded CONFIG_SYS_LDSCRIPT instances
authorTom Rini <trini@konsulko.com>
Sun, 2 Jun 2019 12:57:31 +0000 (08:57 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 14 Jun 2019 20:10:49 +0000 (16:10 -0400)
A number of boards set CONFIG_SYS_LDSCRIPT and then end up using one of
the default searched LDSCRIPT paths.  Remove these customizations.

Signed-off-by: Tom Rini <trini@konsulko.com>
16 files changed:
include/configs/P1010RDB.h
include/configs/P1022DS.h
include/configs/T102xQDS.h
include/configs/T102xRDB.h
include/configs/T104xRDB.h
include/configs/T208xQDS.h
include/configs/T208xRDB.h
include/configs/T4240QDS.h
include/configs/T4240RDB.h
include/configs/am335x_evm.h
include/configs/baltos.h
include/configs/bav335x.h
include/configs/dragonboard410c.h
include/configs/dragonboard820c.h
include/configs/edb93xx.h
include/configs/p1_p2_rdb_pc.h

index 610091b774abcdb3d75b295fd00344c8289ddaf4..964d3db3d75c19423cdf8cd61ef9f3c847a9c691 100644 (file)
@@ -23,7 +23,6 @@
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x11000000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (96 << 10)
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_COMMON_INIT_DDR
 #endif
@@ -44,7 +43,6 @@
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x11000000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (96 << 10)
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_COMMON_INIT_DDR
 #endif
index 695fdd53930ffb3df959d99e670542302b639104..ac5eee45210d0c90db86e8848c02813b9f32439d 100644 (file)
@@ -20,7 +20,6 @@
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x11000000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (128 << 10)
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
-#define CONFIG_SYS_LDSCRIPT            "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_COMMON_INIT_DDR
 #endif
@@ -37,7 +36,6 @@
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x11000000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (128 << 10)
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_COMMON_INIT_DDR
 #endif
index 8ad5c848e9c443b9887de40cadafe1f82840dbe3..7c7ffb602537ec0773e133f7328c270e2ac6aaf9 100644 (file)
@@ -55,7 +55,6 @@
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
-#define CONFIG_SYS_LDSCRIPT            "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
@@ -68,7 +67,6 @@
 #define CONFIG_SYS_MMC_U_BOOT_DST      (0x00200000)
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x00200000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
-#define CONFIG_SYS_LDSCRIPT            "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
index 86997f5eb7555b321f7bc500c85deb6bac428319..adb440b25a923816dbbc92624ce6f771c3e66413 100644 (file)
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x30000000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x30000000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
-#define CONFIG_SYS_LDSCRIPT            "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
@@ -79,7 +78,6 @@
 #define CONFIG_SYS_MMC_U_BOOT_DST      (0x30000000)
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x30000000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
-#define CONFIG_SYS_LDSCRIPT            "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
index 1ec7d7fec44a41527f58e68c42548976b103520d..de42d53ef9cc97a4494da23bbabc68865e9306ad 100644 (file)
@@ -76,7 +76,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x30000000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x30000000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define        CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
@@ -108,7 +107,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg
 #define CONFIG_SYS_MMC_U_BOOT_DST      (0x30000000)
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x30000000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define        CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
index e7b17e2fdcce340821669dbff0cbf4b3b0720c00..8cdc622ccd538d7922407c8d625677b3350379bb 100644 (file)
@@ -66,7 +66,6 @@
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define        CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
@@ -83,7 +82,6 @@
 #define CONFIG_SYS_MMC_U_BOOT_DST      (0x00200000)
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x00200000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define        CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
index 88a44796586eb32a994dfdfb85491a191a0f7d40..95672d6cfa6589226353a5018bb2bde12bca5535 100644 (file)
@@ -56,7 +56,6 @@
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (256 << 10)
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
@@ -69,7 +68,6 @@
 #define CONFIG_SYS_MMC_U_BOOT_DST      (0x00200000)
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x00200000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (260 << 10)
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
index 1350a87c90b3bd6c4507bbae73e28a8eb99339b5..1431d0d2d25735243b2894260dab3791b6c57975 100644 (file)
@@ -44,7 +44,6 @@
 #ifndef CONFIG_SPL_BUILD
 #define        CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_sd_rcw.cfg
 #endif
 
index 318f1ea4c045fe02603d1b551b15c91250fe739a..0accdc6119478e2df51ae3f58eaf23bc3a06593b 100644 (file)
@@ -35,7 +35,6 @@
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
 #endif
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t4rdb/t4_sd_rcw.cfg
 #endif
 
index 7721907d8f0db2ca3df5de7a2fe669548f36651a..b5fba0a8b08e5924028760d25c9781bd5542fddf 100644 (file)
@@ -31,9 +31,6 @@
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
-/* Custom script for NOR */
-#define CONFIG_SYS_LDSCRIPT            "board/ti/am335x/u-boot.lds"
-
 /* Always 128 KiB env size */
 #define CONFIG_ENV_SIZE                        SZ_128K
 
index 98ec0d626ea873fdabe099a9cc8e7798dd4b2019..fbf657fe659618ff39e073947e53e70fb6ff80d0 100644 (file)
@@ -25,9 +25,6 @@
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
-/* Custom script for NOR */
-#define CONFIG_SYS_LDSCRIPT            "board/vscom/baltos/u-boot.lds"
-
 /* Always 128 KiB env size */
 #define CONFIG_ENV_SIZE                        (128 << 10)
 
index 3d4d08aa70e10645fde27682a703e2f03ab7344c..0525efac8faa601615be6d87824efd330cf6c91b 100644 (file)
@@ -31,9 +31,6 @@
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
-/* Custom script for NOR */
-#define CONFIG_SYS_LDSCRIPT            "board/birdland/bav335x/u-boot.lds"
-
 /* Always 128 KiB env size */
 #define CONFIG_ENV_SIZE                        (128 << 10)
 
index 7155ebac5c24c3c627e05033d48e37eec2a56440..bf0e0315c26d7c44ef1c039e7239a6598c8d92b9 100644 (file)
@@ -25,8 +25,6 @@
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY              19000000
 
-#define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"
-
 /* Fixup - in init code we switch from device to host mode,
  * it has to be done after each HCD reset */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
index cc4a4cb3f405cd93de0e77ec0fbc503034dcc933..a41df22273e6ede288b277411a9e70b4d732af64 100644 (file)
@@ -23,7 +23,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x80000)
 #define CONFIG_SYS_BOOTM_LEN           SZ_64M
-#define CONFIG_SYS_LDSCRIPT    "board/qualcomm/dragonboard820c/u-boot.lds"
 
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY              19000000
index 3d90dbcf93ebd54967ad05a776a49f44e87b2a56..84cbcdda93cad81e9c68b724f5181c3f4c011591 100644 (file)
@@ -31,8 +31,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_BOOTFILE                "edb93xx.img"
 
-#define CONFIG_SYS_LDSCRIPT    "board/cirrus/edb93xx/u-boot.lds"
-
 #ifdef CONFIG_EDB9301
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9301
 #define CONFIG_ENV_SECT_SIZE           0x00020000
index 9968a343c3c1ef4375adc2775221e4c3c93aa1d5..8fccd6b77933e0a8ac47de5dce9377fdb15a0290 100644 (file)
 #define CONFIG_SYS_MMC_U_BOOT_START    (0x11000000)
 #define CONFIG_SYS_MMC_U_BOOT_OFFS     (128 << 10)
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_COMMON_INIT_DDR
 #endif
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START      (0x11000000)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS       (128 << 10)
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
-#define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot.lds"
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_COMMON_INIT_DDR
 #endif