mips: unconditionally enable u_boot_list section in u-boot-spl.lds
PATCH 10/16 mips: unconditionally enable u_boot_list section in u-boot-spl.lds
u_boot_list is not only used by DM, but also by some SPL image load methods such as spl_nor.c.
This patch removes CONFIG_SPL_DM surrounding the u_boot_list section to make sure SPL image load methods can be correctly built into u-boot without DM enabled.
--- arch/mips/cpu/u-boot-spl.lds | 2 -- 1 file changed, 2 deletions(-)
arch/mips/cpu/u-boot-spl.lds +0 -2
@@ -27,12 +27,10 @@ SECTIONS *(SORT_BY_ALIGNMENT(.sdata*)) } > .spl_mem -#ifdef CONFIG_SPL_DM . = ALIGN(4); .u_boot_list : { KEEP(*(SORT(.u_boot_list*))); } > .spl_mem -#endif . = ALIGN(4); __image_copy_end = .;
Signature · 1 line
2.17.1
PATCH 10/16 mips: unconditionally enable u_boot_list section in u-boot-spl.lds
Am 08.01.20 um 04:01 schrieb Weijie Gao:
Quoted 17 lines
u_boot_listis not only used by DM, but also by some SPL image load methods such asspl_nor.c.This patch removes
CONFIG_SPL_DMsurrounding theu_boot_listsection to make sure SPL image load methods can be correctly built into u-boot without DM enabled.Signed-off-by Weijie Gao <[email protected]>--- arch/mips/cpu/u-boot-spl.lds | 2 -- 1 file changed, 2 deletions(-)arch/mips/cpu/u-boot-spl.lds +0
-0
arch/mips/cpu/u-boot-spl.lds SECTIONS · line 35
Quoted 9 lines
arch/mips/cpu/u-boot-spl.lds +0
-2@@ -27,12 +27,10 @@ SECTIONS *(SORT_BY_ALIGNMENT(.sdata*)) } > .spl_mem -#ifdef CONFIG_SPL_DM . = ALIGN(4); .u_boot_list : { KEEP(*(SORT(.u_boot_list*))); } > .spl_mem -#endif
unconditionally including this is a bad idea on SoC's with a very constrained SRAM space (e.g. CI20 board) or in SPL/TPL scenarios.
One solution would be to replace #ifdef CONFIG_SPL_DM with something like #ifdef CONFIG_MIPS_SPL_LIST and in Kconfig something like this:
config MIPS_SPL_LIST
bool "..."
default y if (SPL_DM | SPL_NOR_SUPPORT)
default n
Alternatively with an inverted semantic:
#ifndef CONFIG_MIPS_SPL_LIST_EXLCUDE
...
#endif
config MIPS_SPL_LIST_EXLCUDE
bool ""
default nconfig ARCH_JZ47XX
...
select MIPS_SPL_LIST_EXLCUDEQuoted 4 lines
arch/mips/cpu/u-boot-spl.lds +0
-0. = ALIGN(4); __image_copy_end = .;
Signature · 1 line
- Daniel
PATCH 10/16 mips: unconditionally enable u_boot_list section in u-boot-spl.lds
Quoted 48 lines · Daniel Schwierzeck
Am 08.01.20 um 04:01 schrieb Weijie Gao:
Quoted 17 lines
u_boot_listis not only used by DM, but also by some SPL image load methods such asspl_nor.c.This patch removes
CONFIG_SPL_DMsurrounding theu_boot_listsection to make sure SPL image load methods can be correctly built into u-boot without DM enabled.Signed-off-by Weijie Gao <[email protected]>--- arch/mips/cpu/u-boot-spl.lds | 2 -- 1 file changed, 2 deletions(-)arch/mips/cpu/u-boot-spl.lds +0
-0arch/mips/cpu/u-boot-spl.lds SECTIONS · line 35
Quoted 9 lines
arch/mips/cpu/u-boot-spl.lds +0
-2@@ -27,12 +27,10 @@ SECTIONS *(SORT_BY_ALIGNMENT(.sdata*)) } > .spl_mem -#ifdef CONFIG_SPL_DM . = ALIGN(4); .u_boot_list : { KEEP(*(SORT(.u_boot_list*))); } > .spl_mem -#endifunconditionally including this is a bad idea on SoC's with a very constrained SRAM space (e.g. CI20 board) or in SPL/TPL scenarios.
One solution would be to replace #ifdef
CONFIG_SPL_DMwith something like #ifdefCONFIG_MIPS_SPL_LISTand inKconfigsomething like this:config
MIPS_SPL_LIST
bool "..."
default y if (SPL_DM|SPL_NOR_SUPPORT)
default nAlternatively with an inverted semantic:
#ifndef
CONFIG_MIPS_SPL_LIST_EXLCUDE
...
#endif
Quoted 14 lines
config
MIPS_SPL_LIST_EXLCUDEbool "" default nconfig
ARCH_JZ47XX... select MIPS_SPL_LIST_EXLCUDEQuoted 4 lines
arch/mips/cpu/u-boot-spl.lds +0
-0. = ALIGN(4); __image_copy_end = .;
I think adding CONFIG_SPL_LOADER_SUPPORT is also OK:
#if defined(CONFIG_SPL_DM) || defined(CONFIG_SPL_LOADER_SUPPORT)
. = ALIGN(4);
.u_boot_list : {
KEEP(*(SORT(.u_boot_list*)));
} > .spl_mem
#endif
In mach Kconfig:
config SPL_LOADER_SUPPORT
bool
default y if SPL_NOR_SUPPORT
default n