pico-imx7d: Convert to distro config

Instead of keeping a custom environment, use a more generic approach
by switching to disto config.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index d2ffa70fc556100a5152666fe7b2c5b878dd0c1d..243c12faea155c1545e663434183aeda78d455d0 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -41,48 +41,21 @@
        "console=ttymxc4\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
-       "fdt_file=imx7d-pico-pi.dtb\0" \
+       "fdtfile=imx7d-pico-pi.dtb\0" \
        "fdt_addr=0x83000000\0" \
-       "ip_dyn=yes\0" \
-       "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
-       "finduuid=part uuid mmc 0:2 uuid\0" \
-       "mmcargs=setenv bootargs console=${console},${baudrate} " \
-               "root=PARTUUID=${uuid} rootwait rw\0" \
-       "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-       "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-       "mmcboot=echo Booting from mmc ...; " \
-               "run finduuid; " \
-               "run mmcargs; " \
-               "if run loadfdt; then " \
-                       "bootz ${loadaddr} - ${fdt_addr}; " \
-               "else " \
-                       "echo WARN: Cannot load the DT; " \
-               "fi;\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-               "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} ${image}; " \
-               "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-                       "bootz ${loadaddr} - ${fdt_addr}; " \
-               "else " \
-                       "echo WARN: Cannot load the DT; " \
-               "fi;\0"
-
-#define CONFIG_BOOTCOMMAND \
-       "if mmc rescan; then " \
-               "if run loadimage; then " \
-                       "run mmcboot; " \
-               "else run netboot; " \
-               "fi; " \
-       "else run netboot; fi"
+       "fdt_addr_r=0x83000000\0" \
+       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "ramdisk_addr_r=0x83000000\0" \
+       "ramdiskaddr=0x83000000\0" \
+       "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+       BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
 
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x20000000)