board: toradex: imx: Remove not needed env variables

Remove not needed variables from environment and include config files.

 - setup variable used to be executed from some bootscript, however
   it's not required and there is no point on having this small helper
   here
 - boot_file, kernel_file, ip_dyn variables are not used anywhere
 - fdt_fixup variable is just set empty
 - defargs, vidargs variables used to be used from some bootscript,
   however there is no point on having it here and even old legacy
   bootscript can work without them
 - removed CONFIG_ENABLE_DDR_TRAINING_DEBUG, this is a leftover from
   some copy/paste

On colibri imx6ull/imx7 NAND module, remove consoleblank=0, this is
already the Linux kernel default therefore useless.

Various Linux Kernel command line options removed are not-existing
left-over that applied to some old NXP i.MX downstream branch

Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 845705c86db22083d3811ba5ba6cda2aba4e4351..c8ec034fc9790749f44c9434de56db4e82068e8d 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -46,8 +46,6 @@
        "fdt_board=eval\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \
-               "consoleblank=0 earlycon\0" \
        "update_uboot=askenv confirm Did you load flash.bin resp. u-boot-dtb.imx (y/N)?; " \
                "if test \"$confirm\" = \"y\"; then " \
                "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 8a9f3ef75a7dd0108d1be0a8bb11b8881105777c..0df3917e20093234139647ec00829bebbafba8da 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -64,12 +64,9 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
        BOOTENV \
-       "boot_file=zImage\0" \
        "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc0\0" \
-       "defargs=enable_wait_mode=off vmalloc=400M\0" \
        "fdt_board=eval\0" \
-       "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
@@ -80,16 +77,12 @@
                "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \
                " ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
-       "setup=setenv setupargs fec_mac=${ethaddr} " \
-               "consoleblank=0 no_console_suspend=1 console=tty1 " \
-               "console=${console},${baudrate}n8\0 " \
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-       "vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0"
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"
 
 /* Miscellaneous configurable options */
 

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 561a61ebc03c532711469eb3e199b28dcf4c3027..7c9d633b68d951dd1ef5a4de4cdbf0e749e6cc6e 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -48,8 +48,8 @@
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
                "ubi.fm_autoconvert=1\0" \
        "ubiboot=run setup; " \
-               "setenv bootargs ${defargs} ${ubiargs} " \
-               "${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \
+               "setenv bootargs ${ubiargs} " \
+               "${setupargs} ${tdxargs}; echo Booting from NAND...; " \
                "ubi part ubi &&" \
                "ubi read ${kernel_addr_r} kernel && " \
                "ubi read ${fdt_addr_r} dtb && " \
@@ -86,11 +86,7 @@
        UBOOT_UPDATE \
        "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc0\0" \
-       "defargs=user_debug=30\0" \
        "fdt_board=eval-v3\0" \
-       "fdt_fixup=;\0" \
-       "ip_dyn=yes\0" \
-       "kernel_file=zImage\0" \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "${board}/flash_eth.img && source ${loadaddr}\0" \
@@ -99,7 +95,7 @@
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "setup=setenv setupargs " \
                "console=tty1 console=${console}" \
-               ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \
+               ",${baudrate}n8 ${memargs} ${mtdparts}\0" \
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb && " \
                "fatload ${interface} 0:1 ${loadaddr} " \

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 042fcb8757ff823efc8f0016d577ad6fb36059a1..2b7fea30116f60b0f116a65c7323d7e0ca54531b 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -40,8 +40,6 @@
        "fdt_board=eval-v3\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \
-               "consoleblank=0 earlycon\0" \
        "update_uboot=askenv confirm Did you load flash.bin resp. u-boot-dtb.imx (y/N)?; " \
                "if test \"$confirm\" = \"y\"; then " \
                "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 4b2841833b5a697d7568c963305637c94de60ae3..79e5b870b8129b1a28919861760bc9ffe903241e 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -58,12 +58,9 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
        BOOTENV \
-       "boot_file=zImage\0" \
        "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc0\0" \
-       "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
        "fdt_board=eval-v3\0" \
-       "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
@@ -72,16 +69,12 @@
        "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; load " \
                "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
-       "setup=setenv setupargs fec_mac=${ethaddr} " \
-               "consoleblank=0 no_console_suspend=1 console=tty1 " \
-               "console=${console},${baudrate}n8\0 " \
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-       "vidargs=fbmem=8M\0"
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"
 
 /* Miscellaneous configurable options */
 

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 7a9f4afe7d17b8b50e928442d634bdff01ba5e22..c34f1f903df6b97610c45d5aa27af4274475dd4f 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -89,8 +89,8 @@
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
                "ubi.fm_autoconvert=1\0" \
        "ubiboot=run setup; " \
-               "setenv bootargs ${defargs} ${ubiargs} " \
-               "${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \
+               "setenv bootargs ${ubiargs} " \
+               "${setupargs} ${tdxargs}; echo Booting from NAND...; " \
                "ubi part ubi && run m4boot && " \
                "ubi read ${kernel_addr_r} kernel && " \
                "ubi read ${fdt_addr_r} dtb && " \
@@ -123,15 +123,10 @@
        MEM_LAYOUT_ENV_SETTINGS \
        MODULE_EXTRA_ENV_SETTINGS \
        UBOOT_UPDATE \
-       "boot_file=zImage\0" \
        "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc0\0" \
-       "defargs=\0" \
        "fdt_board=eval-v3\0" \
-       "fdt_fixup=;\0" \
        "m4boot=;\0" \
-       "ip_dyn=yes\0" \
-       "kernel_file=zImage\0" \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "${board}/flash_eth.img && source ${loadaddr}\0" \
@@ -140,7 +135,7 @@
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "setup=setenv setupargs " \
                "console=tty1 console=${console}" \
-               ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \
+               ",${baudrate}n8 ${memargs} ${mtdparts}\0" \
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb && " \
                "fatload ${interface} 0:1 ${loadaddr} " \

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index a7ea02807ddfd0a0b7567616ac22dc9c5d170db2..34238d3b505cd4b443195d36215a55de42163fed 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -37,14 +37,11 @@
 #define CFG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
-       "boot_file=Image\0" \
        "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc0\0" \
        "fdt_board=dev\0" \
        "initrd_addr=0x43800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \
-               "consoleblank=0 earlycon\0" \
        "update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \
                "if test \"$confirm\" = \"y\"; then " \
                "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \

diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 256bab089ffcd3c1f6837613059bf16aa76075b6..0b88e95603d5017692c2cb86f71f66e621dfa249 100644 (file)
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -13,7 +13,6 @@
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR                              0x184000
@@ -40,15 +39,11 @@
 #define CFG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
-       "boot_file=Image\0" \
-       "boot_scripts=boot.scr\0" \
        "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc2\0" \
        "fdt_board=dev\0" \
        "initrd_addr=0x43800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \
-               "consoleblank=0 earlycon\0" \
        "update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \
                "if test \"$confirm\" = \"y\"; then " \
                "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \