configs: keystone2: Change to using env files

Move to using .env file for setting up environment variables for K2x_evm.

Signed-off-by: Andrew Davis <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

5 files changed, 0 insertions, 176 deletions

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 604b85084ca..5cdd87c0a17 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -9,20 +9,6 @@
 #ifndef __CONFIG_K2E_EVM_H
 #define __CONFIG_K2E_EVM_H
 
-/* U-Boot general configuration */
-#define ENV_KS2_BOARD_SETTINGS						\
-	DEFAULT_FW_INITRAMFS_BOOT_ENV					\
-	DEFAULT_FIT_TI_ARGS						\
-	"findfdt=setenv fdtfile ${name_fdt}\0"				\
-	"boot=ubi\0"							\
-	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
-	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"	\
-	"name_fdt=keystone-k2e-evm.dtb\0"				\
-	"name_mon=skern-k2e.bin\0"					\
-	"name_ubi=k2e-evm-ubifs.ubi\0"					\
-	"name_uboot=u-boot-spi-k2e-evm.gph\0"				\
-	"name_fs=arago-console-image-k2e-evm.cpio.gz\0"
-
 #include <configs/ti_armv7_keystone2.h>
 
 /* Network */
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 186145edc4c..2f25d393a37 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -9,46 +9,6 @@
 #ifndef __CONFIG_K2G_EVM_H
 #define __CONFIG_K2G_EVM_H
 
-#include <environment/ti/mmc.h>
-
-/* U-Boot general configuration */
-#define ENV_KS2_BOARD_SETTINGS						\
-	DEFAULT_MMC_TI_ARGS						\
-	DEFAULT_PMMC_BOOT_ENV						\
-	DEFAULT_FW_INITRAMFS_BOOT_ENV					\
-	DEFAULT_FIT_TI_ARGS						\
-	"boot=mmc\0"							\
-	"console=ttyS0,115200n8\0"					\
-	"bootpart=0:2\0"						\
-	"bootdir=/boot\0"						\
-	"rd_spec=-\0"							\
-	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
-	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"	\
-	"findfdt="\
-		"if test $board_name = 66AK2GGP; then " \
-			 "setenv name_fdt keystone-k2g-evm.dtb; " \
-		"else if test $board_name = 66AK2GG1; then " \
-			"setenv name_fdt keystone-k2g-evm.dtb; " \
-		"else if test $board_name = 66AK2GIC; then " \
-			 "setenv name_fdt keystone-k2g-ice.dtb; " \
-		"else if test $board_name = 66AK2GI1; then " \
-			 "setenv name_fdt keystone-k2g-ice.dtb; " \
-		"else if test $name_fdt = undefined; then " \
-			"echo WARNING: Could not determine device tree to use;"\
-		"fi;fi;fi;fi; setenv fdtfile ${name_fdt}\0" \
-	"name_mon=skern-k2g.bin\0"					\
-	"name_ubi=k2g-evm-ubifs.ubi\0"					\
-	"name_uboot=u-boot-spi-k2g-evm.gph\0"				\
-	"init_mmc=run args_all args_mmc\0"				\
-	"init_fw_rd_mmc=load mmc ${bootpart} ${rdaddr} "		\
-		"${bootdir}/${name_fw_rd}; run set_rd_spec\0"		\
-	"soc_variant=k2g\0"						\
-	"get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0"\
-	"get_kern_mmc=load mmc ${bootpart} ${loadaddr} "		\
-		"${bootdir}/${name_kern}\0"				\
-	"get_mon_mmc=load mmc ${bootpart} ${addr_mon} ${bootdir}/${name_mon}\0"\
-	"name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
-
 /* Network */
 #define CFG_KSNET_CPSW_NUM_PORTS	2
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 44a47995b73..5e52bbb98f8 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -9,20 +9,6 @@
 #ifndef __CONFIG_K2HK_EVM_H
 #define __CONFIG_K2HK_EVM_H
 
-/* U-Boot general configuration */
-#define ENV_KS2_BOARD_SETTINGS						\
-	DEFAULT_FW_INITRAMFS_BOOT_ENV					\
-	DEFAULT_FIT_TI_ARGS						\
-	"findfdt=setenv fdtfile ${name_fdt}\0"				\
-	"boot=ubi\0"							\
-	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
-	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"	\
-	"name_fdt=keystone-k2hk-evm.dtb\0"				\
-	"name_mon=skern-k2hk.bin\0"					\
-	"name_ubi=k2hk-evm-ubifs.ubi\0"					\
-	"name_uboot=u-boot-spi-k2hk-evm.gph\0"				\
-	"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
-
 #include <configs/ti_armv7_keystone2.h>
 
 /* Network */
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 43d4049cd9c..199959fbd42 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -9,20 +9,6 @@
 #ifndef __CONFIG_K2L_EVM_H
 #define __CONFIG_K2L_EVM_H
 
-/* U-Boot general configuration */
-#define ENV_KS2_BOARD_SETTINGS						\
-	DEFAULT_FW_INITRAMFS_BOOT_ENV					\
-	DEFAULT_FIT_TI_ARGS						\
-	"findfdt=setenv fdtfile ${name_fdt}\0"				\
-	"boot=ubi\0"							\
-	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
-	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0"	\
-	"name_fdt=keystone-k2l-evm.dtb\0"				\
-	"name_mon=skern-k2l.bin\0"					\
-	"name_ubi=k2l-evm-ubifs.ubi\0"					\
-	"name_uboot=u-boot-spi-k2l-evm.gph\0"				\
-	"name_fs=arago-console-image-k2l-evm.cpio.gz\0"
-
 #include <configs/ti_armv7_keystone2.h>
 
 /* Network */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 586ccaacd3f..72c04d8a994 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -63,106 +63,12 @@
 #define CFG_SYS_NAND_LARGEPAGE
 #define CFG_SYS_NAND_BASE_LIST		{ 0x30000000, }
 
-#define DFU_ALT_INFO_MMC \
-	"dfu_alt_info_mmc=" \
-	"MLO fat 0 1;" \
-	"u-boot.img fat 0 1;" \
-	"uEnv.txt fat 0 1\0"
 
-/* DFU settings */
-#define DFUARGS \
-	"dfu_bufsiz=0x10000\0" \
-	DFU_ALT_INFO_MMC \
 
 /* U-Boot general configuration */
 
 /* EDMA3 */
 
-#define DEFAULT_FW_INITRAMFS_BOOT_ENV					\
-	"name_fw_rd=k2-fw-initrd.cpio.gz\0"				\
-	"set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0"		\
-	"init_fw_rd_net=dhcp ${rdaddr} ${tftp_root}/${name_fw_rd}; "	\
-		"run set_rd_spec\0"					\
-	"init_fw_rd_nfs=nfs ${rdaddr} ${nfs_root}/boot/${name_fw_rd}; "	\
-		"run set_rd_spec\0"					\
-	"init_fw_rd_ramfs=setenv rd_spec -\0"				\
-	"init_fw_rd_ubi=ubifsload ${rdaddr} ${bootdir}/${name_fw_rd}; "	\
-		"run set_rd_spec\0"					\
-
-#define DEFAULT_PMMC_BOOT_ENV						\
-	"set_name_pmmc=setenv name_pmmc ti-sci-firmware-${soc_variant}.bin\0" \
-	"dev_pmmc=0\0"							\
-	"get_pmmc_net=dhcp ${loadaddr} ${tftp_root}/${name_pmmc}\0"	\
-	"get_pmmc_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_pmmc}\0"	\
-	"get_pmmc_ramfs=run get_pmmc_net\0"				\
-	"get_pmmc_mmc=load mmc ${bootpart} ${loadaddr} "		\
-			"${bootdir}/${name_pmmc}\0"			\
-	"get_pmmc_ubi=ubifsload ${loadaddr} ${bootdir}/${name_pmmc}\0"	\
-	"run_pmmc=rproc init; rproc list; "				\
-		"rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; "	\
-		"rproc start ${dev_pmmc}\0"				\
-
-#define CFG_EXTRA_ENV_SETTINGS					\
-	DEFAULT_LINUX_BOOT_ENV						\
-	ENV_KS2_BOARD_SETTINGS						\
-	DFUARGS								\
-	"bootdir=/boot\0" \
-	"tftp_root=/\0"							\
-	"nfs_root=/export\0"						\
-	"mem_lpae=1\0"							\
-	"uinitrd_fixup=1\0"						\
-	"addr_ubi=0x82000000\0"						\
-	"addr_secdb_key=0xc000000\0"					\
-	"name_kern=zImage\0"						\
-	"addr_mon=0x87000000\0"						\
-	"addr_non_sec_mon=0x0c097fc0\0"					\
-	"addr_load_sec_bm=0x0c09c000\0"					\
-	"run_mon=mon_install ${addr_mon}\0"				\
-	"run_mon_hs=mon_install ${addr_non_sec_mon} "			\
-			"${addr_load_sec_bm}\0"				\
-	"run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0"		\
-	"init_net=run args_all args_net\0"				\
-	"init_nfs=setenv autoload no; dhcp; run args_all args_net\0"	\
-	"init_ubi=run args_all args_ubi; "				\
-		"ubi part ubifs; ubifsmount ubi:rootfs;\0"			\
-	"get_fdt_net=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0"	\
-	"get_fdt_nfs=nfs ${fdtaddr} ${nfs_root}/boot/${name_fdt}\0"	\
-	"get_fdt_ubi=ubifsload ${fdtaddr} ${bootdir}/${name_fdt}\0"		\
-	"get_kern_net=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0"	\
-	"get_kern_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_kern}\0"	\
-	"get_kern_ubi=ubifsload ${loadaddr} ${bootdir}/${name_kern}\0"		\
-	"get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0"	\
-	"get_mon_nfs=nfs ${addr_mon} ${nfs_root}/boot/${name_mon}\0"	\
-	"get_mon_ubi=ubifsload ${addr_mon} ${bootdir}/${name_mon}\0"	\
-	"get_fit_net=dhcp ${addr_fit} ${tftp_root}/${name_fit}\0"	\
-	"get_fit_nfs=nfs ${addr_fit} ${nfs_root}/boot/${name_fit}\0"	\
-	"get_fit_ubi=ubifsload ${addr_fit} ${bootdir}/${name_fit}\0"	\
-	"get_fit_mmc=load mmc ${bootpart} ${addr_fit} ${bootdir}/${name_fit}\0" \
-	"get_uboot_net=dhcp ${loadaddr} ${tftp_root}/${name_uboot}\0"	\
-	"get_uboot_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_uboot}\0" \
-	"burn_uboot_spi=sf probe; sf erase 0 0x100000; "		\
-		"sf write ${loadaddr} 0 ${filesize}\0"		\
-	"burn_uboot_nand=nand erase 0 0x100000; "			\
-		"nand write ${loadaddr} 0 ${filesize}\0"		\
-	"args_all=setenv bootargs console=ttyS0,115200n8 rootwait\0"	\
-	"args_net=setenv bootargs ${bootargs} rootfstype=nfs "		\
-		"root=/dev/nfs rw nfsroot=${serverip}:${nfs_root},"	\
-		"${nfs_options} ip=dhcp\0"				\
-	"nfs_options=v3,tcp,rsize=4096,wsize=4096\0"			\
-	"get_fdt_ramfs=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0"	\
-	"get_kern_ramfs=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0"	\
-	"get_mon_ramfs=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0"	\
-	"get_fit_ramfs=dhcp ${addr_fit} ${tftp_root}/${name_fit}\0"	\
-	"get_fs_ramfs=dhcp ${rdaddr} ${tftp_root}/${name_fs}\0"	\
-	"get_ubi_net=dhcp ${addr_ubi} ${tftp_root}/${name_ubi}\0"	\
-	"get_ubi_nfs=nfs ${addr_ubi} ${nfs_root}/boot/${name_ubi}\0"	\
-	"burn_ubi=nand erase.part ubifs; "				\
-		"nand write ${addr_ubi} ubifs ${filesize}\0"		\
-	"init_ramfs=run args_all args_ramfs get_fs_ramfs\0"		\
-	"args_ramfs=setenv bootargs ${bootargs} "			\
-		"rdinit=/sbin/init rw root=/dev/ram0 "			\
-		"initrd=0x808080000,80M\0"				\
-	"no_post=1\0"
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>