From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio Estevam Date: Thu, 25 Aug 2016 17:57:44 -0300 Subject: [U-Boot] [PATCH 2/3] warp7: Handle mmcroot for mainline and NXP In-Reply-To: <1472158665-14240-1-git-send-email-festevam@gmail.com> References: <1472158665-14240-1-git-send-email-festevam@gmail.com> Message-ID: <1472158665-14240-2-git-send-email-festevam@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Fabio Estevam 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 --- include/configs/warp7.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 1.9.1