diff mbox series

[v3,13/20] mips: add an option to enable u_boot_list section for SPL loaders in u-boot-spl.lds

Message ID 1579594758-7190-1-git-send-email-weijie.gao@mediatek.com
State New
Headers show
Series Refactor the architecture parts of mt7628 | expand

Commit Message

Weijie Gao Jan. 21, 2020, 8:19 a.m. UTC
u_boot_list is not only used by DM, but also by some SPL image load methods
such as spl_nor.c.

This patch adds an option CONFIG_SPL_LOADER_SUPPORT in conjunction with
CONFIG_SPL_DM surrounding the u_boot_list section to make sure SPL image
loaders can be correctly built into u-boot SPL without DM enabled.

Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
Signed-off-by: Weijie Gao <weijie.gao at mediatek.com>
---
Changes since v2: move SPL_LOADER_SUPPORT to arch/mips/Kconfig
---
 arch/mips/Kconfig            | 6 ++++++
 arch/mips/cpu/u-boot-spl.lds | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Stefan Roese Jan. 21, 2020, 8:46 a.m. UTC | #1
On 21.01.20 09:19, Weijie Gao wrote:
> u_boot_list is not only used by DM, but also by some SPL image load methods
> such as spl_nor.c.
> 
> This patch adds an option CONFIG_SPL_LOADER_SUPPORT in conjunction with
> CONFIG_SPL_DM surrounding the u_boot_list section to make sure SPL image
> loaders can be correctly built into u-boot SPL without DM enabled.
> 
> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
> Signed-off-by: Weijie Gao <weijie.gao at mediatek.com>
> ---
> Changes since v2: move SPL_LOADER_SUPPORT to arch/mips/Kconfig

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan
diff mbox series

Patch

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5f82caf8be..7b9d0072eb 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -335,6 +335,12 @@  config SPL_INIT_STACK_WITHOUT_MALLOC_F
 	  malloc space. Platform should set the malloc_base later when DRAM is
 	  ready to use.
 
+config SPL_LOADER_SUPPORT
+	bool
+	default n
+	help
+	  Enable this option if you want to use SPL loaders without DM enabled.
+
 endmenu
 
 menu "OS boot interface"
diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds
index e467491639..28ea4f2a48 100644
--- a/arch/mips/cpu/u-boot-spl.lds
+++ b/arch/mips/cpu/u-boot-spl.lds
@@ -27,7 +27,7 @@  SECTIONS
 		*(SORT_BY_ALIGNMENT(.sdata*))
 	} > .spl_mem
 
-#ifdef CONFIG_SPL_DM
+#if defined(CONFIG_SPL_DM) || defined(CONFIG_SPL_LOADER_SUPPORT)
 	. = ALIGN(4);
 	.u_boot_list : {
 		KEEP(*(SORT(.u_boot_list*)));