[PATCH 1/3] phycore_imx8mm: Switch to using env text files

[Yunus Bas]

Hi Yannic,

Am Montag, dem 25.11.2024 um 09:15 +0000 schrieb Yannic Moog:
> Hi Yunus,
> 
> please use get_maintainer script to get a list of people to send (a
> copy of) the patches to.
> Usually Maintainers are put in To: field and reviewers Cc:

Will do, thank you for the note.

> 
> Additionally, I suggest using a cover letter to summarize the changes
> made in this patch series.

I don't think a cover letter is needed here, since the changes are
trivial and also mentioned in the commit description.

> 
> On Fri, 2024-11-22 at 11:28 +0100, Yunus Bas wrote:
> > Move the environment into the board directory and convert header to
> > a
> > txt file. In addition, this patch also applies following changes:
> > 
> > - Change default nfsroot path to /srv/nfs due to compliance with
> > Linux
> > FHS 3.0.
> > 
> > - Rename specific variables as stated in the bootstd documentation.
> > Renamed variables:
> > 	fdt_addr => fdt_addr_r
> > 	fdt_file => fdtfile
> > 
> > Signed-off-by: Yunus Bas <y.bas at phytec.de>
> > ---
> >  .../phytec/phycore_imx8mm/phycore_imx8mm.env  | 52
> > +++++++++++++++++++
> >  include/configs/phycore_imx8mm.h              | 46 ---------------
> > -
> >  2 files changed, 52 insertions(+), 46 deletions(-)
> >  create mode 100644 board/phytec/phycore_imx8mm/phycore_imx8mm.env
> > 
> > diff --git a/board/phytec/phycore_imx8mm/phycore_imx8mm.env
> > b/board/phytec/phycore_imx8mm/phycore_imx8mm.env
> > new file mode 100644
> > index 00000000000..b2f61843995
> > --- /dev/null
> > +++ b/board/phytec/phycore_imx8mm/phycore_imx8mm.env
> > @@ -0,0 +1,52 @@
> > +console=ttymxc2,115200
> > +emmc_dev=2
> > +fdt_addr_r=0x48000000
> > +fdtfile=CONFIG_DEFAULT_FDT_FILE
> > +image=Image
> > +ip_dyn=yes
> > +loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}
> > +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}
> > +mmcargs=
> > +	setenv bootargs console=${console}
> > +	root=/dev/mmcblk${mmcdev}p${mmcroot} rootwait rw
> > +mmcautodetect=yes
> > +mmcboot=
> > +	echo Booting from mmc ...;
> > +	run mmcargs;
> > +	if run loadfdt; then
> > +		if test ${dofitboot} = 1; then
> > +			booti ${loadaddr} - ${fdt_addr_r}
> > +		else
> > +			echo WARN: Cannot load the DT;
> > +		fi;
> > +	fi;
> > +mmcdev=CONFIG_SYS_MMC_ENV_DEV
> > +mmcpart=1
> > +mmcroot=2
> > +netargs=
> > +	setenv bootargs console=${console} root=/dev/nfs ip=dhcp
> > +	nfsroot=${serverip}:${nfsroot},v3,tcp
> > +netboot=
> > +	echo Booting from net ...;
> > +	if test ${ip_dyn} = yes; then
> > +		setenv get_cmd dhcp;
> > +	else
> > +		setenv get_cmd tftp;
> > +	fi;
> > +	${get_cmd} ${loadaddr} ${image};
> > +	run netargs;
> > +	if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then
> > +		booti ${loadaddr} - ${fdt_addr_r};
> > +	else
> > +		echo WARN: Cannot load the DT;
> > +	fi;
> > +nfsroot=/srv/nfs
> > +sd_dev=1
> 
> This unexplained change snuck in; at least I don't see sd_dev defined
> before. Please update commit
> description or remove it.

Again, thank you for your attention. This one slipped in. I'll update
the patch and send a v2.

Regards
Yunus
> 
> Yannic
> 
> > +update_bootimg=
> > +	mmc dev ${mmcdev};
> > +	if dhcp ${loadaddr} ${update_filepath}/${update_filename};
> > then
> > +		setexpr fw_sz ${filesize} / 0x200;
> > +		mmc write ${loadaddr} ${update_offset} ${fw_sz};
> > +	fi;
> > +update_filename=flash.bin
> > +update_offset=0x42
> > diff --git a/include/configs/phycore_imx8mm.h
> > b/include/configs/phycore_imx8mm.h
> > index e74a3f184c6..20e2ab832ee 100644
> > --- a/include/configs/phycore_imx8mm.h
> > +++ b/include/configs/phycore_imx8mm.h
> > @@ -20,52 +20,6 @@
> >  /* For RAW image gives a error info not panic */
> >  #endif
> >  
> > -#define CFG_EXTRA_ENV_SETTINGS \
> > -	"image=Image\0" \
> > -	"console=ttymxc2,115200\0" \
> > -	"fdt_addr=0x48000000\0" \
> > -	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
> > -	"ip_dyn=yes\0" \
> > -	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
> > -	"mmcpart=1\0" \
> > -	"mmcroot=2\0" \
> > -	"update_offset=0x42\0" \
> > -	"update_filename=flash.bin\0" \
> > -
> > 	"update_bootimg="						\
> > -		"mmc dev ${mmcdev} ; "		\
> > -		"if dhcp ${loadaddr}
> > ${update_filepath}/${update_filename} ; then "	\
> > -		"setexpr fw_sz ${filesize} / 0x200 ; "	/* SD
> > block size */ \
> > -		"mmc write ${loadaddr} ${update_offset} ${fw_sz} ;
> > "	\
> > -		"fi\0" \
> > -	"mmcautodetect=yes\0" \
> > -	"mmcargs=setenv bootargs console=${console} " \
> > -		"root=/dev/mmcblk${mmcdev}p${mmcroot} rootwait
> > rw\0" \
> > -	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
> > ${image}\0" \
> > -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr}
> > ${fdt_file}\0" \
> > -	"mmcboot=echo Booting from mmc ...; " \
> > -		"run mmcargs; " \
> > -		"if run loadfdt; then " \
> > -			"booti ${loadaddr} - ${fdt_addr}; " \
> > -		"else " \
> > -			"echo WARN: Cannot load the DT; " \
> > -		"fi;\0 " \
> > -	"nfsroot=/nfs\0" \
> > -	"netargs=setenv bootargs console=${console} root=/dev/nfs
> > ip=dhcp " \
> > -		"nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
> > -	"netboot=echo Booting from net ...; " \
> > -		"run netargs; " \
> > -		"if test ${ip_dyn} = yes; then " \
> > -			"setenv get_cmd dhcp; " \
> > -		"else " \
> > -			"setenv get_cmd tftp; " \
> > -		"fi; " \
> > -		"${get_cmd} ${loadaddr} ${image}; " \
> > -		"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
> > -			"booti ${loadaddr} - ${fdt_addr}; " \
> > -		"else " \
> > -			"echo WARN: Cannot load the DT; " \
> > -		"fi;\0" \
> > -
> >  /* Link Definitions */
> >  
> >  #define CFG_SYS_INIT_RAM_ADDR	0x40000000
> 

-- 
PHYTEC Messtechnik GmbH | Barcelona-Allee 1 | 55129 Mainz, Germany

Geschäftsführer: Dipl.-Ing. Michael Mitezki, Dipl.-Ing. Bodo Huber,
Dipl.-Ing. (FH) Marcus Lickes | Handelsregister Mainz HRB 4656 |
Finanzamt Mainz | St.Nr.: 26/665/00608, USt-ID: DE 149059855