diff mbox

[U-Boot,2/3] warp7: Handle mmcroot for mainline and NXP

Message ID 1472158665-14240-2-git-send-email-festevam@gmail.com
State Superseded
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Aug. 25, 2016, 8:57 p.m. UTC 
From: Fabio Estevam <fabio.estevam@nxp.com>

The rootfs appears at mmcblk2 in the NXP kernel and at mmcblk1 in mainline
kernel.

Load the correct mmcblk device depending on the selection of the
CONFIG_ARMV7_BOOT_SEC_DEFAULT variable.

CONFIG_ARMV7_BOOT_SEC_DEFAULT is selected in warp7_secure_defconfig, which
is used to boot a NXP kernel.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 include/configs/warp7.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index e59b16c..f089247 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -113,7 +113,11 @@ 
 
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_SYS_MMC_ENV_PART		0
-#define CONFIG_MMCROOT			"/dev/mmcblk2p2"
+#ifdef CONFIG_ARMV7_BOOT_SEC_DEFAULT
+#define CONFIG_MMCROOT			"/dev/mmcblk2p2" /* NXP kernel */
+#else
+#define CONFIG_MMCROOT			"/dev/mmcblk1p2" /* Mainline kernel */
+#endif
 
 /* USB Configs */
 #define CONFIG_USB_STORAGE