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

[Otavio Salvador]

On Thu, Aug 25, 2016 at 5:26 PM, Fabio Estevam <festevam at gmail.com> wrote:
> 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.

Well ...

warp7: Select secure boot

In order to boot NXP 4.1.15 we need to boot in secure mode.

So enable the variable CONFIG_ARMV7_BOOT_SEC_DEFAULT by default.

Signed-off-by: Breno Lima <breno.lima at nxp.com>

>From Breno, sent to the mailing list, does fix this and so it does work.

> 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

Someone using mainline kernel is expected to know how to set mmcroot
variable or so. I would not include this patch at all.


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750