diff mbox series

imx8mn_ddr4_evk: Allow booting the kernel by default

Message ID 20210304110716.2368558-1-festevam@gmail.com
State Accepted
Commit 17bc2cf89ba3ae6f8f1a22fe2b8d9b4b443510cd
Delegated to: Tom Rini
Headers show
Series imx8mn_ddr4_evk: Allow booting the kernel by default | expand

Commit Message

Fabio Estevam March 4, 2021, 11:07 a.m. UTC
Currently it is not possible to boot Linux from the SD card
by default.

Make the necessary adjustments to allow it.

Reported-by: Peter Bergin <peter@berginkonsult.se>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 configs/imx8mn_ddr4_evk_defconfig | 1 +
 include/configs/imx8mn_evk.h      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Andrey Zhizhikin March 4, 2021, 12:59 p.m. UTC | #1
Hello Fabio,

On Thu, Mar 4, 2021 at 12:07 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Currently it is not possible to boot Linux from the SD card
> by default.
>
> Make the necessary adjustments to allow it.
>
> Reported-by: Peter Bergin <peter@berginkonsult.se>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>

Tested-by: Andrey Zhizhikin <andrey.z@gmail.com> # imx8mn_ddr4_evk

> ---
>  configs/imx8mn_ddr4_evk_defconfig | 1 +
>  include/configs/imx8mn_evk.h      | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig
> index f7ea65886d51..2c12bdabe0a0 100644
> --- a/configs/imx8mn_ddr4_evk_defconfig
> +++ b/configs/imx8mn_ddr4_evk_defconfig
> @@ -54,6 +54,7 @@ CONFIG_SPL_OF_CONTROL=y
>  CONFIG_ENV_OVERWRITE=y
>  CONFIG_ENV_IS_IN_MMC=y
>  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SYS_MMC_ENV_DEV=1
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_SPL_DM=y
>  CONFIG_SPL_CLK_COMPOSITE_CCF=y
> diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
> index 1e2825337e2d..596e255ca6de 100644
> --- a/include/configs/imx8mn_evk.h
> +++ b/include/configs/imx8mn_evk.h
> @@ -34,10 +34,10 @@
>  /* Initial environment variables */
>  #define CONFIG_EXTRA_ENV_SETTINGS              \
>         "script=boot.scr\0" \
> -       "image=Image.itb\0" \
> +       "image=Image\0" \
>         "console=ttymxc1,115200\0" \
>         "fdt_addr=0x43000000\0"                 \
> -       "boot_fit=try\0" \
> +       "boot_fit=no\0" \
>         "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
>         "initrd_addr=0x43800000\0"              \
>         "bootm_size=0x10000000\0" \
> --
> 2.25.1
>
Fabio Estevam March 20, 2021, 2:05 p.m. UTC | #2
Hi Stefano and Tom,

On Thu, Mar 4, 2021 at 9:59 AM Andrey Zhizhikin <andrey.z@gmail.com> wrote:
>
> Hello Fabio,
>
> On Thu, Mar 4, 2021 at 12:07 PM Fabio Estevam <festevam@gmail.com> wrote:
> >
> > Currently it is not possible to boot Linux from the SD card
> > by default.
> >
> > Make the necessary adjustments to allow it.
> >
> > Reported-by: Peter Bergin <peter@berginkonsult.se>
> > Signed-off-by: Fabio Estevam <festevam@gmail.com>
>
> Tested-by: Andrey Zhizhikin <andrey.z@gmail.com> # imx8mn_ddr4_evk

Please consider applying this one for 2021.04 as it allows imx8mn-evk
booting Linux by default.

Thanks
Stefano Babic March 20, 2021, 6:18 p.m. UTC | #3
Hi Fabio,

On 20.03.21 15:05, Fabio Estevam wrote:
> Hi Stefano and Tom,
> 
> On Thu, Mar 4, 2021 at 9:59 AM Andrey Zhizhikin <andrey.z@gmail.com> wrote:
>>
>> Hello Fabio,
>>
>> On Thu, Mar 4, 2021 at 12:07 PM Fabio Estevam <festevam@gmail.com> wrote:
>>>
>>> Currently it is not possible to boot Linux from the SD card
>>> by default.
>>>
>>> Make the necessary adjustments to allow it.
>>>
>>> Reported-by: Peter Bergin <peter@berginkonsult.se>
>>> Signed-off-by: Fabio Estevam <festevam@gmail.com>
>>
>> Tested-by: Andrey Zhizhikin <andrey.z@gmail.com> # imx8mn_ddr4_evk
> 
> Please consider applying this one for 2021.04 as it allows imx8mn-evk
> booting Linux by default.
> 

Thanks for fixing it. I pick it up for release.

Stefano

> Thanks
>
Peng Fan March 22, 2021, 1:40 a.m. UTC | #4
> Subject: [PATCH] imx8mn_ddr4_evk: Allow booting the kernel by default
> 
> Currently it is not possible to boot Linux from the SD card by default.
> 
> Make the necessary adjustments to allow it.
> 
> Reported-by: Peter Bergin <peter@berginkonsult.se>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
>  configs/imx8mn_ddr4_evk_defconfig | 1 +
>  include/configs/imx8mn_evk.h      | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/imx8mn_ddr4_evk_defconfig
> b/configs/imx8mn_ddr4_evk_defconfig
> index f7ea65886d51..2c12bdabe0a0 100644
> --- a/configs/imx8mn_ddr4_evk_defconfig
> +++ b/configs/imx8mn_ddr4_evk_defconfig
> @@ -54,6 +54,7 @@ CONFIG_SPL_OF_CONTROL=y
> CONFIG_ENV_OVERWRITE=y  CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SYS_MMC_ENV_DEV=1
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_SPL_DM=y
>  CONFIG_SPL_CLK_COMPOSITE_CCF=y
> diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
> index 1e2825337e2d..596e255ca6de 100644
> --- a/include/configs/imx8mn_evk.h
> +++ b/include/configs/imx8mn_evk.h
> @@ -34,10 +34,10 @@
>  /* Initial environment variables */
>  #define CONFIG_EXTRA_ENV_SETTINGS		\
>  	"script=boot.scr\0" \
> -	"image=Image.itb\0" \
> +	"image=Image\0" \
>  	"console=ttymxc1,115200\0" \
>  	"fdt_addr=0x43000000\0"			\
> -	"boot_fit=try\0" \
> +	"boot_fit=no\0" \
>  	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
>  	"initrd_addr=0x43800000\0"		\
>  	"bootm_size=0x10000000\0" \
> --

Reviewed-by: Peng Fan <peng.fan@nxp.com>
Fabio Estevam April 5, 2021, 11:54 a.m. UTC | #5
Hi Stefano,

On Sat, Mar 20, 2021 at 3:18 PM Stefano Babic <sbabic@denx.de> wrote:

> > Please consider applying this one for 2021.04 as it allows imx8mn-evk
> > booting Linux by default.
> >
>
> Thanks for fixing it. I pick it up for release.

It seems this one is still missing. Could it be applied for 2021.04?

Thanks
Tom Rini April 5, 2021, 12:09 p.m. UTC | #6
On Thu, Mar 04, 2021 at 08:07:16AM -0300, Fabio Estevam wrote:

> Currently it is not possible to boot Linux from the SD card
> by default.
> 
> Make the necessary adjustments to allow it.
> 
> Reported-by: Peter Bergin <peter@berginkonsult.se>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Tested-by: Andrey Zhizhikin <andrey.z@gmail.com> # imx8mn_ddr4_evk
> Reviewed-by: Peng Fan <peng.fan@nxp.com>

Applied to u-boot/master, thanks!
Stefano Babic April 5, 2021, 12:27 p.m. UTC | #7
Hi Fabio, Tom,

On 05.04.21 13:54, Fabio Estevam wrote:
> Hi Stefano,
> 
> On Sat, Mar 20, 2021 at 3:18 PM Stefano Babic <sbabic@denx.de> wrote:
> 
>>> Please consider applying this one for 2021.04 as it allows imx8mn-evk
>>> booting Linux by default.
>>>
>>
>> Thanks for fixing it. I pick it up for release.
> 
> It seems this one is still missing. Could it be applied for 2021.04?
> 

I see in patchwork that patch is already set to "accepted" and was 
delegated to Tom, but I could not find it as well in Tom's official 
tree. I merged into u-boot-imx, but is it maybe in another Tom's branch 
ready for release ?

Regards,
Stefano
Tom Rini April 5, 2021, 12:35 p.m. UTC | #8
On Mon, Apr 05, 2021 at 02:27:35PM +0200, Stefano Babic wrote:
> Hi Fabio, Tom,
> 
> On 05.04.21 13:54, Fabio Estevam wrote:
> > Hi Stefano,
> > 
> > On Sat, Mar 20, 2021 at 3:18 PM Stefano Babic <sbabic@denx.de> wrote:
> > 
> > > > Please consider applying this one for 2021.04 as it allows imx8mn-evk
> > > > booting Linux by default.
> > > > 
> > > 
> > > Thanks for fixing it. I pick it up for release.
> > 
> > It seems this one is still missing. Could it be applied for 2021.04?
> > 
> 
> I see in patchwork that patch is already set to "accepted" and was delegated
> to Tom, but I could not find it as well in Tom's official tree. I merged
> into u-boot-imx, but is it maybe in another Tom's branch ready for release ?

I've applied it locally to master, but I haven't pushed since I'm
otherwise getting ready to do the release and I don't want to get CI too
bogged down just yet.
diff mbox series

Patch

diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig
index f7ea65886d51..2c12bdabe0a0 100644
--- a/configs/imx8mn_ddr4_evk_defconfig
+++ b/configs/imx8mn_ddr4_evk_defconfig
@@ -54,6 +54,7 @@  CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_CLK_COMPOSITE_CCF=y
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 1e2825337e2d..596e255ca6de 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -34,10 +34,10 @@ 
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"script=boot.scr\0" \
-	"image=Image.itb\0" \
+	"image=Image\0" \
 	"console=ttymxc1,115200\0" \
 	"fdt_addr=0x43000000\0"			\
-	"boot_fit=try\0" \
+	"boot_fit=no\0" \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"initrd_addr=0x43800000\0"		\
 	"bootm_size=0x10000000\0" \