[PATCH 1/3] smegw01: Allow booting the Yocto image by default

[PATCH 1/3] smegw01: Allow booting the Yocto image by default

[Fabio Estevam]

On the Yocto image there is a single partition and the kernel
and dtb are present in the 'boot' directory.

Change it accordingly so that the board can boot the Yocto
image by default.

Use the generic 'load' command instead, which is able to
read from an ext4 partition.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 include/configs/smegw01.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
index 50f00136ac46..a92c583c8669 100644
--- a/include/configs/smegw01.h
+++ b/include/configs/smegw01.h
@@ -29,11 +29,11 @@
 	"bootm_size=0x10000000\0" \
 	"mmcdev=0\0" \
 	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+	"mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
-	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
+	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
+	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"if run loadfdt; then " \
-- 
2.25.1

[PATCH 2/3] smegw01: Re-sync the defconfig

[Fabio Estevam]

Re-sync the defconfig by doing:

make smegw01_defconfig
make savedefconfig
cp defconfig configs/smegw01_defconfig

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 configs/smegw01_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index aa10577a9f3f..9bfaa010ae77 100644
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -6,12 +6,12 @@ CONFIG_SYS_MEMTEST_END=0xa0000000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-smegw01"
 CONFIG_TARGET_SMEGW01=y
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 # CONFIG_ARMV7_VIRT is not set
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
-CONFIG_DEFAULT_DEVICE_TREE="imx7d-smegw01"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/storopack/smegw01/imximage.cfg"
-- 
2.25.1

[PATCH 3/3] smegw01: Select the CMD_UNZIP option

[Fabio Estevam]

Select the CMD_UNZIP option so that the 'gzwrite' command
can be used to flash .gz image into the eMMC.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 configs/smegw01_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index 9bfaa010ae77..75fd5bc24a81 100644
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_UNZIP=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
-- 
2.25.1

Re: [PATCH 1/3] smegw01: Allow booting the Yocto image by default

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]

On Tue, Jun 15, 2021 at 08:38:38PM -0300, Fabio Estevam wrote:

> On the Yocto image there is a single partition and the kernel
> and dtb are present in the 'boot' directory.
> 
> Change it accordingly so that the board can boot the Yocto
> image by default.
> 
> Use the generic 'load' command instead, which is able to
> read from an ext4 partition.
> 
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
>  include/configs/smegw01.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
> index 50f00136ac46..a92c583c8669 100644
> --- a/include/configs/smegw01.h
> +++ b/include/configs/smegw01.h
> @@ -29,11 +29,11 @@
>  	"bootm_size=0x10000000\0" \
>  	"mmcdev=0\0" \
>  	"mmcpart=1\0" \
> -	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
> +	"mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
>  	"mmcargs=setenv bootargs console=${console},${baudrate} " \
>  		"root=${mmcroot}\0" \
> -	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
> -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
> +	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
> +	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
>  	"mmcboot=echo Booting from mmc ...; " \
>  		"run mmcargs; " \
>  		"if run loadfdt; then " \

Shouldn't this be using the generic distro boot and then generating an
extlinux.conf in OE?  Thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 2/3] smegw01: Re-sync the defconfig

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 519 bytes --]

On Tue, Jun 15, 2021 at 08:38:39PM -0300, Fabio Estevam wrote:

> Re-sync the defconfig by doing:
> 
> make smegw01_defconfig
> make savedefconfig
> cp defconfig configs/smegw01_defconfig
> 
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
>  configs/smegw01_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This will likely conflict with the next resync I do, and since it's not
part of migrating a Kconfig option or similar I don't think this ends up
being a win.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[PATCH 1/3] smegw01: Allow booting the Yocto image by default

[sbabic]

> On the Yocto image there is a single partition and the kernel
> and dtb are present in the 'boot' directory.
> Change it accordingly so that the board can boot the Yocto
> image by default.
> Use the generic 'load' command instead, which is able to
> read from an ext4 partition.
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================

[PATCH 3/3] smegw01: Select the CMD_UNZIP option

[sbabic]

> Select the CMD_UNZIP option so that the 'gzwrite' command
> can be used to flash .gz image into the eMMC.
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================

[PATCH 1/3] smegw01: Allow booting the Yocto image by default

[sbabic]

> On the Yocto image there is a single partition and the kernel
> and dtb are present in the 'boot' directory.
> Change it accordingly so that the board can boot the Yocto
> image by default.
> Use the generic 'load' command instead, which is able to
> read from an ext4 partition.
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================

[PATCH 3/3] smegw01: Select the CMD_UNZIP option

[sbabic]

> Select the CMD_UNZIP option so that the 'gzwrite' command
> can be used to flash .gz image into the eMMC.
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================

Re: [PATCH 1/3] smegw01: Allow booting the Yocto image by default

[Stefano Babic]

Hi,

just for the note because there is an open comment and I applied it:

On 16.06.21 05:17, Tom Rini wrote:
> On Tue, Jun 15, 2021 at 08:38:38PM -0300, Fabio Estevam wrote:
> 
>> On the Yocto image there is a single partition and the kernel
>> and dtb are present in the 'boot' directory.
>>
>> Change it accordingly so that the board can boot the Yocto
>> image by default.
>>
>> Use the generic 'load' command instead, which is able to
>> read from an ext4 partition.
>>
>> Signed-off-by: Fabio Estevam <festevam@denx.de>
>> ---
>>   include/configs/smegw01.h | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
>> index 50f00136ac46..a92c583c8669 100644
>> --- a/include/configs/smegw01.h
>> +++ b/include/configs/smegw01.h
>> @@ -29,11 +29,11 @@
>>   	"bootm_size=0x10000000\0" \
>>   	"mmcdev=0\0" \
>>   	"mmcpart=1\0" \
>> -	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
>> +	"mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
>>   	"mmcargs=setenv bootargs console=${console},${baudrate} " \
>>   		"root=${mmcroot}\0" \
>> -	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
>> -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
>> +	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \
>> +	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \
>>   	"mmcboot=echo Booting from mmc ...; " \
>>   		"run mmcargs; " \
>>   		"if run loadfdt; then " \
> 
> Shouldn't this be using the generic distro boot and then generating an
> extlinux.conf in OE?  Thanks!
> 

This is not an evaluation board but a customer's project with strict 
rules about environment (secure boot is required) and with a short list 
of variable that can be modified (from both U-Boot and user space). A 
generic distro boot is then unwanted, and just a few set of variables 
are allowed in this project. An extlinux.conf is not allowed. So I 
merged it, I have not ignored the comment, I had to answer before, sorry 
for that.

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================