From: Peng Fan <peng.fan@nxp.com>
Date: Tue, 27 Aug 2019 06:25:07 +0000 (+0000)
Subject: imx: spl: add spl_board_boot_device for i.MX8MM
X-Git-Tag: v2020.01-rc1~33^2~55
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6c646b3de466b222b9a43d240cec1a8b582b1baf;p=oweals%2Fu-boot.git

imx: spl: add spl_board_boot_device for i.MX8MM

Differnet board has different controller used, it is
hard to use one layout for them all.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index f33b9f0962..30fa6aeb25 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -18,6 +18,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+__weak int spl_board_boot_device(enum boot_device boot_dev_spl)
+{
+	return 0;
+}
+
 #if defined(CONFIG_MX6)
 /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */
 u32 spl_boot_device(void)
@@ -132,6 +137,9 @@ u32 spl_boot_device(void)
 
 	enum boot_device boot_device_spl = get_boot_device();
 
+	if (IS_ENABLED(CONFIG_IMX8MM))
+		return spl_board_boot_device(boot_device_spl);
+
 	switch (boot_device_spl) {
 #if defined(CONFIG_MX7)
 	case SD1_BOOT: