On Sun, May 28, 2023 at 2:18 PM Adam Ford <aford...@gmail.com> wrote:
>
> Instead of cluttering up a header file with a bunch of defines,
> move the default environmental variables to a file called
> imx8mm_beacon.env and reference it from the defconfig.
>
Stefano / Tom,
Is this series OK? If so, I'll continue to do this to other Beacon
and Logic PD boards.
adam
> Signed-off-by: Adam Ford <aford...@gmail.com>
> ---
> board/beacon/imx8mm/imx8mm_beacon.env | 19 ++++++++++
> configs/imx8mm_beacon_defconfig | 1 +
> include/configs/imx8mm_beacon.h | 50 ---------------------------
> 3 files changed, 20 insertions(+), 50 deletions(-)
> create mode 100644 board/beacon/imx8mm/imx8mm_beacon.env
>
> diff --git a/board/beacon/imx8mm/imx8mm_beacon.env
> b/board/beacon/imx8mm/imx8mm_beacon.env
> new file mode 100644
> index 0000000000..00bf67edd5
> --- /dev/null
> +++ b/board/beacon/imx8mm/imx8mm_beacon.env
> @@ -0,0 +1,19 @@
> +boot_fit=try
> +bootscript=echo Running bootscript from mmc ...; source
> +console=ttymxc1
> +fdt_addr=0x45000000
> +fdt_file=imx8mm-beacon-kit.dtb
> +finduuid=part uuid mmc ${mmcdev}:2 uuid
> +image=Image
> +initrd_addr=0x46000000
> +loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};
> +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}
> +loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}
> +mmcargs=setenv bootargs console=${console},${baudrate} root=PARTUUID=${uuid}
> rootwait rw ${mtdparts} ${optargs}
> +mmcautodetect=yes
> +mmcboot=echo Booting from mmc ...; run finduuid; run mmcargs; if run
> loadfdt; then booti ${loadaddr} - ${fdt_addr}; else echo WARN: Cannot load
> the DT; fi;
> +netargs=setenv bootargs console=${console},${baudrate} root=/dev/nfs ip=dhcp
> nfsroot=${serverip}:${nfsroot},v3,tcp
> +mmcdev=1
> +mmcpart=1
> +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 test ${boot_fit} = yes || test ${boot_fit} = try;
> then bootm ${loadaddr}; else if ${get_cmd} ${fdt_addr} ${fdt_file}; then
> booti ${loadaddr} - ${fdt_addr}; else echo WARN: Cannot load the DT; fi; fi;
> +script=boot.scr
> diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig
> index 597fe256d0..c049db32c1 100644
> --- a/configs/imx8mm_beacon_defconfig
> +++ b/configs/imx8mm_beacon_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
> CONFIG_SPL_GPIO=y
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
> +CONFIG_ENV_SOURCE_FILE="imx8mm_beacon"
> CONFIG_SF_DEFAULT_SPEED=10000000
> CONFIG_ENV_SIZE=0x2000
> CONFIG_ENV_OFFSET=0xFFFFDE00
> diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
> index d85ae21e23..c8dab91f61 100644
> --- a/include/configs/imx8mm_beacon.h
> +++ b/include/configs/imx8mm_beacon.h
> @@ -19,56 +19,6 @@
>
> #endif
>
> -/* Initial environment variables */
> -#define CFG_EXTRA_ENV_SETTINGS \
> - "script=boot.scr\0" \
> - "image=Image\0" \
> - "console=ttymxc1,115200\0" \
> - "fdt_addr=0x43000000\0" \
> - "boot_fit=try\0" \
> - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
> - "initrd_addr=0x43800000\0" \
> - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
> - "mmcpart=1\0" \
> - "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
> - "mmcautodetect=yes\0" \
> - "mmcargs=setenv bootargs console=${console},${baudrate}" \
> - " root=PARTUUID=${uuid} rootwait rw ${mtdparts} ${optargs}\0" \
> - "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}" \
> - " ${script};\0" \
> - "bootscript=echo Running bootscript from mmc ...; " \
> - "source\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 finduuid; " \
> - "run mmcargs; " \
> - "if run loadfdt; then " \
> - "booti ${loadaddr} - ${fdt_addr}; " \
> - "else " \
> - "echo WARN: Cannot load the DT; " \
> - "fi; " \
> - "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 test ${boot_fit} = yes || test ${boot_fit} = try; then " \
> - "bootm ${loadaddr}; " \
> - "else " \
> - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
> - "booti ${loadaddr} - ${fdt_addr}; " \
> - "else " \
> - "echo WARN: Cannot load the DT; " \
> - "fi; " \
> - "fi;\0"
> -
> /* Link Definitions */
>
> #define CFG_SYS_INIT_RAM_ADDR 0x40000000
> --
> 2.39.2
>
