There are no CMDs to be run in SPL and no need for any of their lists.
CC: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Jagan Teki jagan@openedev.com Cc: Maxime Ripard maxime.ripard@free-electrons.com Cc: "Andreas Bießmann" andreas@biessmann.org Cc: Michal Simek monstr@monstr.eu Cc: Daniel Schwierzeck daniel.schwierzeck@gmail.com Cc: Mario Six mario.six@gdsys.cc Cc: Wolfgang Denk wd@denx.de Cc: York Sun york.sun@nxp.com Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com Cc:Wenyou Yang wenyou.yang@atmel.com Cc: Lokesh Vutla lokeshvutla@ti.com Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/cpu/arm1136/u-boot-spl.lds | 3 +++ arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 3 +++ arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds | 3 +++ arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 3 +++ arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 3 +++ arch/arm/cpu/armv8/u-boot-spl.lds | 3 +++ arch/arm/cpu/u-boot-spl.lds | 3 +++ arch/arm/mach-at91/arm926ejs/u-boot-spl.lds | 3 +++ arch/arm/mach-at91/armv7/u-boot-spl.lds | 3 +++ arch/arm/mach-omap2/u-boot-spl.lds | 3 +++ arch/arm/mach-zynq/u-boot-spl.lds | 3 +++ arch/microblaze/cpu/u-boot-spl.lds | 3 +++ arch/mips/cpu/u-boot-spl.lds | 3 +++ arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 3 +++ arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 3 +++ arch/sandbox/cpu/u-boot-spl.lds | 2 ++ arch/x86/cpu/u-boot-spl.lds | 3 +-- 17 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/arm1136/u-boot-spl.lds b/arch/arm/cpu/arm1136/u-boot-spl.lds index 97e4a8bc873f..6668e2edd654 100644 --- a/arch/arm/cpu/arm1136/u-boot-spl.lds +++ b/arch/arm/cpu/arm1136/u-boot-spl.lds @@ -19,6 +19,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { __start = .; diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds index bf2ac13056bd..d39027db23b5 100644 --- a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds @@ -16,6 +16,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + . = CONFIG_SPL_TEXT_BASE;
. = ALIGN(4); diff --git a/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds index 6f7fca07e371..150451b88fd8 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds @@ -27,6 +27,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { __start = .; diff --git a/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds index 47910d3e4f82..f9af63cd14de 100644 --- a/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds @@ -21,6 +21,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { __start = .; diff --git a/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds b/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds index 53f0cbd2b7ea..f9d27fa0c511 100644 --- a/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds @@ -24,6 +24,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { __start = .; diff --git a/arch/arm/cpu/armv8/u-boot-spl.lds b/arch/arm/cpu/armv8/u-boot-spl.lds index 0d1b0c499304..40f112237a60 100644 --- a/arch/arm/cpu/armv8/u-boot-spl.lds +++ b/arch/arm/cpu/armv8/u-boot-spl.lds @@ -22,6 +22,9 @@ OUTPUT_ARCH(aarch64) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { . = ALIGN(8); *(.__image_copy_start) diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds index 65f7b68861e2..b5a89556b6b2 100644 --- a/arch/arm/cpu/u-boot-spl.lds +++ b/arch/arm/cpu/u-boot-spl.lds @@ -12,6 +12,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + . = 0x00000000;
. = ALIGN(4); diff --git a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds index 1b0420611ed3..186dbd88d54e 100644 --- a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds +++ b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds @@ -15,6 +15,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { __start = .; diff --git a/arch/arm/mach-at91/armv7/u-boot-spl.lds b/arch/arm/mach-at91/armv7/u-boot-spl.lds index d2e41a026c4d..dffd89a78af3 100644 --- a/arch/arm/mach-at91/armv7/u-boot-spl.lds +++ b/arch/arm/mach-at91/armv7/u-boot-spl.lds @@ -22,6 +22,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { __start = .; diff --git a/arch/arm/mach-omap2/u-boot-spl.lds b/arch/arm/mach-omap2/u-boot-spl.lds index e9da2a9dd186..c70b19bdced7 100644 --- a/arch/arm/mach-omap2/u-boot-spl.lds +++ b/arch/arm/mach-omap2/u-boot-spl.lds @@ -19,6 +19,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text : { __start = .; diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds index 9a59164c876f..70d0b0fab82f 100644 --- a/arch/arm/mach-zynq/u-boot-spl.lds +++ b/arch/arm/mach-zynq/u-boot-spl.lds @@ -18,6 +18,9 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + . = ALIGN(4); .text : { diff --git a/arch/microblaze/cpu/u-boot-spl.lds b/arch/microblaze/cpu/u-boot-spl.lds index c60336ca5ca8..6814aaceb562 100644 --- a/arch/microblaze/cpu/u-boot-spl.lds +++ b/arch/microblaze/cpu/u-boot-spl.lds @@ -13,6 +13,9 @@ ENTRY(_start)
SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + .text ALIGN(0x4): { __text_start = .; diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds index 07004ea11155..19444e3e600e 100644 --- a/arch/mips/cpu/u-boot-spl.lds +++ b/arch/mips/cpu/u-boot-spl.lds @@ -11,6 +11,9 @@ OUTPUT_ARCH(mips) ENTRY(_start) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + . = 0x00000000;
. = ALIGN(4); diff --git a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds index 4101eaf3f327..66ba02ce434c 100644 --- a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds @@ -10,6 +10,9 @@ OUTPUT_ARCH(powerpc) SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + . = 0xfff00000; .text : { *(.text*) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index 889a4c24001a..f959272d9703 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -19,6 +19,9 @@ PHDRS #endif SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) } + . = CONFIG_SPL_TEXT_BASE; .text : { *(.text*) diff --git a/arch/sandbox/cpu/u-boot-spl.lds b/arch/sandbox/cpu/u-boot-spl.lds index 7e92b4ac66c8..bd4666e2ce88 100644 --- a/arch/sandbox/cpu/u-boot-spl.lds +++ b/arch/sandbox/cpu/u-boot-spl.lds @@ -8,6 +8,8 @@
SECTIONS { + /* There are no CMDs in SPL */ + /DISCARD/ : { *(.u_boot_list_2_cmd_*) }
. = ALIGN(4); .u_boot_list : { diff --git a/arch/x86/cpu/u-boot-spl.lds b/arch/x86/cpu/u-boot-spl.lds index 8a38d58f123d..d0c804fa829e 100644 --- a/arch/x86/cpu/u-boot-spl.lds +++ b/arch/x86/cpu/u-boot-spl.lds @@ -12,9 +12,8 @@ ENTRY(_start)
SECTIONS { -#ifndef CONFIG_CMDLINE + /* There are no CMDs in SPL */ /DISCARD/ : { *(.u_boot_list_2_cmd_*) } -#endif
. = CONFIG_SPL_TEXT_BASE; /* Location of bootcode in flash */ __text_start = .;