[U-Boot] [PATCH] warp7: Adjust CONFIG_MMCROOT for booting a mainline kernel

[Fabio Estevam]

Hi Otavio,

On Thu, Aug 25, 2016 at 5:13 PM, Otavio Salvador
<otavio.salvador at ossystems.com.br> wrote:
> On Thu, Aug 25, 2016 at 3:27 PM, Fabio Estevam <fabio.estevam at nxp.com> wrote:
>> When booting a mainline kernel on warp7 we have:
>> - mmc0: Wifi SDIO chip
>> - mmc1: eMMC
>>
>> , so point CONFIG_MMCROOT to use mmcblk1 instead.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam at nxp.com>
>
> As far as I know, the sold WaRP7 boards are shipped with the NXP
> kernel so if this patch is applied, the U-Boot won't work out of box
> for most of users

Currently U-Boot mainline does not boot NXP kernel, so I am not
breaking anything here.

To better handle NXP kernel I can add a 'warp7_secure_defconfig' and
then do like this
to handle the mmcroot:

--- 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