Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit c7110a0ad5ee901c9df7e7e98b63724f44332e18

Authored by Tom Rini
1 parent db4080d56d
Exists in smarc_8mq_lf_v2020.04 and in 10 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

configs: Remove unneeded CONFIG_SYS_LDSCRIPT instances 

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>

Showing 16 changed files with 0 additions and 32 deletions Side-by-side Diff

include/configs/P1010RDB.h
Diff comments   View file @ c7110a0
... ... @@ -23,7 +23,6 @@
23 23 #define CONFIG_SYS_MMC_U_BOOT_START (0x11000000)
24 24 #define CONFIG_SYS_MMC_U_BOOT_OFFS (96 << 10)
25 25 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
26   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
27 26 #ifdef CONFIG_SPL_BUILD
28 27 #define CONFIG_SPL_COMMON_INIT_DDR
29 28 #endif
... ... @@ -44,7 +43,6 @@
44 43 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000)
45 44 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (96 << 10)
46 45 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
47   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
48 46 #ifdef CONFIG_SPL_BUILD
49 47 #define CONFIG_SPL_COMMON_INIT_DDR
50 48 #endif
include/configs/P1022DS.h
Diff comments   View file @ c7110a0
... ... @@ -20,7 +20,6 @@
20 20 #define CONFIG_SYS_MMC_U_BOOT_START (0x11000000)
21 21 #define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10)
22 22 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
23   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
24 23 #ifdef CONFIG_SPL_BUILD
25 24 #define CONFIG_SPL_COMMON_INIT_DDR
26 25 #endif
... ... @@ -37,7 +36,6 @@
37 36 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000)
38 37 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10)
39 38 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
40   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
41 39 #ifdef CONFIG_SPL_BUILD
42 40 #define CONFIG_SPL_COMMON_INIT_DDR
43 41 #endif
include/configs/T102xQDS.h
Diff comments   View file @ c7110a0
... ... @@ -55,7 +55,6 @@
55 55 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000)
56 56 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x00200000)
57 57 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (256 << 10)
58   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
59 58 #ifndef CONFIG_SPL_BUILD
60 59 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
61 60 #endif
... ... @@ -68,7 +67,6 @@
68 67 #define CONFIG_SYS_MMC_U_BOOT_DST (0x00200000)
69 68 #define CONFIG_SYS_MMC_U_BOOT_START (0x00200000)
70 69 #define CONFIG_SYS_MMC_U_BOOT_OFFS (260 << 10)
71   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
72 70 #ifndef CONFIG_SPL_BUILD
73 71 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
74 72 #endif
include/configs/T102xRDB.h
Diff comments   View file @ c7110a0
... ... @@ -62,7 +62,6 @@
62 62 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000)
63 63 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x30000000)
64 64 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (256 << 10)
65   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
66 65 #ifndef CONFIG_SPL_BUILD
67 66 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
68 67 #endif
... ... @@ -79,7 +78,6 @@
79 78 #define CONFIG_SYS_MMC_U_BOOT_DST (0x30000000)
80 79 #define CONFIG_SYS_MMC_U_BOOT_START (0x30000000)
81 80 #define CONFIG_SYS_MMC_U_BOOT_OFFS (260 << 10)
82   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
83 81 #ifndef CONFIG_SPL_BUILD
84 82 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
85 83 #endif
include/configs/T104xRDB.h
Diff comments   View file @ c7110a0
... ... @@ -76,7 +76,6 @@
76 76 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000)
77 77 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x30000000)
78 78 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (256 << 10)
79   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
80 79 #ifndef CONFIG_SPL_BUILD
81 80 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
82 81 #endif
... ... @@ -108,7 +107,6 @@
108 107 #define CONFIG_SYS_MMC_U_BOOT_DST (0x30000000)
109 108 #define CONFIG_SYS_MMC_U_BOOT_START (0x30000000)
110 109 #define CONFIG_SYS_MMC_U_BOOT_OFFS (260 << 10)
111   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
112 110 #ifndef CONFIG_SPL_BUILD
113 111 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
114 112 #endif
include/configs/T208xQDS.h
Diff comments   View file @ c7110a0
... ... @@ -66,7 +66,6 @@
66 66 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000)
67 67 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x00200000)
68 68 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (256 << 10)
69   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
70 69 #ifndef CONFIG_SPL_BUILD
71 70 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
72 71 #endif
... ... @@ -83,7 +82,6 @@
83 82 #define CONFIG_SYS_MMC_U_BOOT_DST (0x00200000)
84 83 #define CONFIG_SYS_MMC_U_BOOT_START (0x00200000)
85 84 #define CONFIG_SYS_MMC_U_BOOT_OFFS (260 << 10)
86   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
87 85 #ifndef CONFIG_SPL_BUILD
88 86 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
89 87 #endif
include/configs/T208xRDB.h
Diff comments   View file @ c7110a0
... ... @@ -56,7 +56,6 @@
56 56 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000)
57 57 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x00200000)
58 58 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (256 << 10)
59   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
60 59 #ifndef CONFIG_SPL_BUILD
61 60 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
62 61 #endif
... ... @@ -69,7 +68,6 @@
69 68 #define CONFIG_SYS_MMC_U_BOOT_DST (0x00200000)
70 69 #define CONFIG_SYS_MMC_U_BOOT_START (0x00200000)
71 70 #define CONFIG_SYS_MMC_U_BOOT_OFFS (260 << 10)
72   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
73 71 #ifndef CONFIG_SPL_BUILD
74 72 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
75 73 #endif
include/configs/T4240QDS.h
Diff comments   View file @ c7110a0
... ... @@ -44,7 +44,6 @@
44 44 #ifndef CONFIG_SPL_BUILD
45 45 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
46 46 #endif
47   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
48 47 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t4qds/t4_sd_rcw.cfg
49 48 #endif
50 49  
include/configs/T4240RDB.h
Diff comments   View file @ c7110a0
... ... @@ -35,7 +35,6 @@
35 35 #ifndef CONFIG_SPL_BUILD
36 36 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
37 37 #endif
38   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
39 38 #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t4rdb/t4_sd_rcw.cfg
40 39 #endif
41 40  
include/configs/am335x_evm.h
Diff comments   View file @ c7110a0
... ... @@ -31,9 +31,6 @@
31 31 #define V_OSCK 24000000 /* Clock output from T2 */
32 32 #define V_SCLK (V_OSCK)
33 33  
34   -/* Custom script for NOR */
35   -#define CONFIG_SYS_LDSCRIPT "board/ti/am335x/u-boot.lds"
36   -
37 34 /* Always 128 KiB env size */
38 35 #define CONFIG_ENV_SIZE SZ_128K
39 36  
include/configs/baltos.h
Diff comments   View file @ c7110a0
... ... @@ -25,9 +25,6 @@
25 25 #define V_OSCK 24000000 /* Clock output from T2 */
26 26 #define V_SCLK (V_OSCK)
27 27  
28   -/* Custom script for NOR */
29   -#define CONFIG_SYS_LDSCRIPT "board/vscom/baltos/u-boot.lds"
30   -
31 28 /* Always 128 KiB env size */
32 29 #define CONFIG_ENV_SIZE (128 << 10)
33 30  
include/configs/bav335x.h
Diff comments   View file @ c7110a0
... ... @@ -31,9 +31,6 @@
31 31 #define V_OSCK 24000000 /* Clock output from T2 */
32 32 #define V_SCLK (V_OSCK)
33 33  
34   -/* Custom script for NOR */
35   -#define CONFIG_SYS_LDSCRIPT "board/birdland/bav335x/u-boot.lds"
36   -
37 34 /* Always 128 KiB env size */
38 35 #define CONFIG_ENV_SIZE (128 << 10)
39 36  
include/configs/dragonboard410c.h
Diff comments   View file @ c7110a0
... ... @@ -25,8 +25,6 @@
25 25 /* Generic Timer Definitions */
26 26 #define COUNTER_FREQUENCY 19000000
27 27  
28   -#define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"
29   -
30 28 /* Fixup - in init code we switch from device to host mode,
31 29 * it has to be done after each HCD reset */
32 30 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/dragonboard820c.h
Diff comments   View file @ c7110a0
... ... @@ -23,7 +23,6 @@
23 23 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
24 24 #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x80000)
25 25 #define CONFIG_SYS_BOOTM_LEN SZ_64M
26   -#define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard820c/u-boot.lds"
27 26  
28 27 /* Generic Timer Definitions */
29 28 #define COUNTER_FREQUENCY 19000000
include/configs/edb93xx.h
Diff comments   View file @ c7110a0
... ... @@ -31,8 +31,6 @@
31 31 #define CONFIG_SETUP_MEMORY_TAGS 1
32 32 #define CONFIG_BOOTFILE "edb93xx.img"
33 33  
34   -#define CONFIG_SYS_LDSCRIPT "board/cirrus/edb93xx/u-boot.lds"
35   -
36 34 #ifdef CONFIG_EDB9301
37 35 #define CONFIG_MACH_TYPE MACH_TYPE_EDB9301
38 36 #define CONFIG_ENV_SECT_SIZE 0x00020000
include/configs/p1_p2_rdb_pc.h
Diff comments   View file @ c7110a0
... ... @@ -142,7 +142,6 @@
142 142 #define CONFIG_SYS_MMC_U_BOOT_START (0x11000000)
143 143 #define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10)
144 144 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
145   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
146 145 #ifdef CONFIG_SPL_BUILD
147 146 #define CONFIG_SPL_COMMON_INIT_DDR
148 147 #endif
... ... @@ -159,7 +158,6 @@
159 158 #define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000)
160 159 #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10)
161 160 #define CONFIG_SYS_MPC85XX_NO_RESETVEC
162   -#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"
163 161 #ifdef CONFIG_SPL_BUILD
164 162 #define CONFIG_SPL_COMMON_INIT_DDR
165 163 #endif