toradex: drop legacy nfsboot script

Drop legacy nfsboot script in favor of distroboot DHCP boot.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index a45a6ff..a9e0dee 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -50,11 +50,6 @@
                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-               "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
-               "\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; tftp ${fdt_addr} " \
-               "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \
        "panel=NULL\0" \
        "script=boot.scr\0" \
        "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 10cfe1e..face78e 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -59,16 +59,6 @@
        "update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
                "mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
 
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
-       "nfsboot=pci enum; run setup; setenv bootargs ${defargs} ${nfsargs} " \
-               "${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-               "run nfsdtbload; dhcp ${kernel_addr_r} " \
-               "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
-       "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \
-               "${soc}-${fdt_module}-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\0"
-
 #define BOARD_EXTRA_ENV_SETTINGS \
        "boot_file=zImage\0" \
        "boot_script_dhcp=boot.scr\0" \
@@ -80,7 +70,6 @@
        "fdt_board=eval\0" \
        "fdt_fixup=;\0" \
        "fdt_module=" FDT_MODULE "\0" \
-       NFS_BOOTCMD \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index afdcf9b..3a27bbb 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -89,16 +89,6 @@
        "ramdisk_addr_r=0x12200000\0" \
        "scriptaddr=0x17000000\0"
 
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0:on root=/dev/nfs ro\0" \
-       "nfsboot=run setup; " \
-               "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
-               "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-               "run nfsdtbload; dhcp ${kernel_addr_r} " \
-               "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
-               "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
 #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
 #define FDT_FILE "imx6q-apalis-eval.dtb"
 #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
@@ -115,7 +105,6 @@
        "fdtfile=" FDT_FILE "\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
-       NFS_BOOTCMD \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index fa4f8ce..11791ce 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -50,15 +50,6 @@
        "ramdisk_addr_r=0x82200000\0" \
        "scriptaddr=0x87000000\0"
 
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
-       "nfsboot=run setup; " \
-               "setenv bootargs ${defargs} ${nfsargs} " \
-               "${setupargs} ${vidargs}; echo Booting from NFS...;" \
-               "dhcp ${kernel_addr_r} && " \
-               "tftp ${fdt_addr_r} ${fdtfile} && " \
-               "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
                "ubi.fm_autoconvert=1\0" \
@@ -98,7 +89,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
-       NFS_BOOTCMD \
        UBI_BOOTCMD \
        UBOOT_UPDATE \
        "boot_script_dhcp=boot.scr\0" \

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index ee07040..ae5a8ff 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -80,12 +80,6 @@
                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
-       "netargs=setenv bootargs ${consoleargs} " \
-               "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
-               "${vidargs}\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
-               "colibri-imx8x/${fdt_file}; booti ${loadaddr} - " \
-               "${fdt_addr}\0" \
        "panel=NULL\0" \
        "script=boot.scr\0" \
        "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 956b59f..f7e9709 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -78,16 +78,6 @@
        "ramdisk_addr_r=0x12200000\0" \
        "scriptaddr=0x17000000\0"
 
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
-       "nfsboot=run setup; " \
-               "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
-               "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-               "run nfsdtbload; dhcp ${kernel_addr_r} " \
-               "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
-               "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
@@ -99,7 +89,6 @@
        "fdtfile=" FDT_FILE "\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
-       NFS_BOOTCMD \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ff2c30c..3dba7bc 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -89,15 +89,6 @@
        "ramdisk_addr_r=0x82100000\0" \
        "scriptaddr=0x87000000\0"
 
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
-       "nfsboot=run setup; " \
-               "setenv bootargs ${defargs} ${nfsargs} " \
-               "${setupargs} ${vidargs}; echo Booting from NFS...;" \
-               "dhcp ${kernel_addr_r} && " \
-               "tftp ${fdt_addr_r} ${soc}-colibri${variant}-${fdt_board}.dtb && " \
-               "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
 #define UBI_BOOTCMD    \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
                "ubi.fm_autoconvert=1\0" \
@@ -136,7 +127,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
-       NFS_BOOTCMD \
        MODULE_EXTRA_ENV_SETTINGS \
        UBOOT_UPDATE \
        "boot_file=zImage\0" \

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index dfc023c..99b0cbb 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -35,15 +35,6 @@
        "update_uboot=nand erase.part u-boot && " \
                "nand write ${loadaddr} u-boot ${filesize}\0" \
 
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
-       "nfsboot=run setup; " \
-       "setenv bootargs ${defargs} ${nfsargs} ${mtdparts} " \
-       "${setupargs} ${vidargs}; echo Booting from NFS...;" \
-       "dhcp ${kernel_addr_r} && "     \
-       "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
        "ubi.fm_autoconvert=1\0" \
@@ -68,7 +59,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
-       NFS_BOOTCMD \
        UBI_BOOTCMD \
        UBOOT_UPDATE \
        "boot_script_dhcp=boot.scr\0" \

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 132edf7..65a01f9 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -58,12 +58,6 @@
        "fdt_board=dev\0" \
        "initrd_addr=0x43800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-               "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
-               "\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; " \
-               "tftp ${fdt_addr} verdin/${fdtfile}; " \
-               "booti ${loadaddr} - ${fdt_addr}\0" \
        "setup=setenv setupargs console=${console},${baudrate} " \
                "console=tty1 consoleblank=0 earlycon\0" \
        "update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \

diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 9e29dc1..da95b8b 100644 (file)
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -76,12 +76,6 @@
        "fdt_board=dev\0" \
        "initrd_addr=0x43800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-               "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
-               "\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; " \
-               "tftp ${fdt_addr} verdin/${fdtfile}; " \
-               "booti ${loadaddr} - ${fdt_addr}\0" \
        "setup=setenv setupargs console=${console},${baudrate} console=tty1 " \
                "consoleblank=0 earlycon\0" \
        "update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \