phycore_imx8mp: Move environment from include/config to board

Move the environment into the board directory and convert it from a C
header to a text file. Sort the variables alphabetically.
No functional changes.

Signed-off-by: Leonard Anderweit <l.anderweit@phytec.de>
Reviewed-by: Teresa Remmet <t.remmet@phytec.de>
Tested-by: Teresa Remmet <t.remmet@phytec.de>

diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
new file mode 100644 (file)
index 0000000..32513e7
--- /dev/null
+++ b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
@@ -0,0 +1,45 @@
+console=ttymxc0,115200
+dofastboot=0
+emmc_dev=2
+fastboot_raw_partition_all=0 4194304
+fastboot_raw_partition_bootloader=64 8128
+fdt_addr=0x48000000
+fdt_file=CONFIG_DEFAULT_FDT_FILE
+image=Image
+ip_dyn=yes
+loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}
+loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}
+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
+               booti ${loadaddr} - ${fdt_addr};
+       else
+               echo WARN: Cannot load the DT;
+       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 ...;
+       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;
+nfsroot=/nfs
+sd_dev=1

diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 11a17be7fe1de20dee88228c23efcae104d33831..206c4d50d2767dd860cceecf518e77931b942aeb 100644 (file)
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -13,49 +13,6 @@
 #define CFG_SYS_UBOOT_BASE \
                (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#define CFG_EXTRA_ENV_SETTINGS \
-       "image=Image\0" \
-       "console=ttymxc0,115200\0" \
-       "fdt_addr=0x48000000\0" \
-       "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
-       "ip_dyn=yes\0" \
-       "dofastboot=0\0" \
-       "fastboot_raw_partition_bootloader=64 8128\0" \
-       "fastboot_raw_partition_all=0 4194304\0" \
-       "emmc_dev=2\0" \
-       "sd_dev=1\0" \
-       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=1\0" \
-       "mmcroot=2\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