[PATCH 1/2] configs: keystone2: Unwind KERNEL_MTD_PARTS definition
This is more complex than it needs to be and makes converting these boards over to plain text env files more difficult. Simplify this environment variable scheme.
Signed-off-by: Andrew Davis afd@ti.com --- include/configs/k2e_evm.h | 5 +---- include/configs/k2g_evm.h | 4 +--- include/configs/k2hk_evm.h | 5 +---- include/configs/k2l_evm.h | 5 +---- include/configs/ti_armv7_keystone2.h | 6 +----- include/environment/ti/spi.h | 14 -------------- 6 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 include/environment/ti/spi.h
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 630dfdc5b7f..46e33233650 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_K2E_EVM_H #define __CONFIG_K2E_EVM_H
-#include <environment/ti/spi.h> - /* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ @@ -19,6 +17,7 @@ "boot=ubi\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ + "mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc)\0" \ "name_fdt=keystone-k2e-evm.dtb\0" \ "name_mon=skern-k2e.bin\0" \ "name_ubi=k2e-evm-ubifs.ubi\0" \ @@ -27,8 +26,6 @@
#include <configs/ti_armv7_keystone2.h>
-#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS - /* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 9
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index d0634a99f49..744f1539a37 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -10,7 +10,6 @@ #define __CONFIG_K2G_EVM_H
#include <environment/ti/mmc.h> -#include <environment/ti/spi.h>
/* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ @@ -37,6 +36,7 @@ "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" \ + "mtdparts=spi1.0:1m(u-boot-spl)ro,-(misc)\0" \ "name_mon=skern-k2g.bin\0" \ "name_ubi=k2g-evm-ubifs.ubi\0" \ "name_uboot=u-boot-spi-k2g-evm.gph\0" \ @@ -54,8 +54,6 @@ #define CFG_KSNET_CPSW_NUM_PORTS 2 #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */
-#define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS - #include <configs/ti_armv7_keystone2.h>
#endif /* __CONFIG_K2G_EVM_H */ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index ed54be839ff..c688c4d738b 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_K2HK_EVM_H #define __CONFIG_K2HK_EVM_H
-#include <environment/ti/spi.h> - /* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ @@ -19,6 +17,7 @@ "boot=ubi\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ + "mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc)\0" \ "name_fdt=keystone-k2hk-evm.dtb\0" \ "name_mon=skern-k2hk.bin\0" \ "name_ubi=k2hk-evm-ubifs.ubi\0" \ @@ -27,8 +26,6 @@
#include <configs/ti_armv7_keystone2.h>
-#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS - /* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 5
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 69d42eaf9f1..c0af0bc2fe5 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_K2L_EVM_H #define __CONFIG_K2L_EVM_H
-#include <environment/ti/spi.h> - /* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ @@ -19,6 +17,7 @@ "boot=ubi\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \ + "mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc)\0" \ "name_fdt=keystone-k2l-evm.dtb\0" \ "name_mon=skern-k2l.bin\0" \ "name_ubi=k2l-evm-ubifs.ubi\0" \ @@ -27,8 +26,6 @@
#include <configs/ti_armv7_keystone2.h>
-#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS - /* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 5
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index a47f0902a26..06aa02a6d40 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -78,10 +78,6 @@
/* EDMA3 */
-#define KERNEL_MTD_PARTS \ - "mtdparts=" \ - SPI_MTD_PARTS - #define DEFAULT_FW_INITRAMFS_BOOT_ENV \ "name_fw_rd=k2-fw-initrd.cpio.gz\0" \ "set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0" \ @@ -149,7 +145,7 @@ "burn_uboot_nand=nand erase 0 0x100000; " \ "nand write ${loadaddr} 0 ${filesize}\0" \ "args_all=setenv bootargs console=ttyS0,115200n8 rootwait " \ - KERNEL_MTD_PARTS \ + "mtdparts=${mtdparts}\0" \ "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ "${nfs_options} ip=dhcp\0" \ diff --git a/include/environment/ti/spi.h b/include/environment/ti/spi.h deleted file mode 100644 index 1681dc8635e..00000000000 --- a/include/environment/ti/spi.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com - * - * Environment variable definitions for SPI on TI boards. - */ - -#ifndef __TI_SPI_H -#define __TI_SPI_H - -#define KEYSTONE_SPI0_MTD_PARTS "spi0.0:1m(u-boot-spl)ro,-(misc);\0" -#define KEYSTONE_SPI1_MTD_PARTS "spi1.0:1m(u-boot-spl)ro,-(misc);\0" - -#endif
Move to using .env file for setting up environment variables for K2x_evm.
Signed-off-by: Andrew Davis afd@ti.com --- board/ti/ks2_evm/Kconfig | 12 +++ board/ti/ks2_evm/k2e_evm.env | 13 +++ board/ti/ks2_evm/k2g_evm.env | 46 +++++++++ board/ti/ks2_evm/k2hk_evm.env | 13 +++ board/ti/ks2_evm/k2l_evm.env | 13 +++ include/configs/k2e_evm.h | 15 --- include/configs/k2g_evm.h | 41 -------- include/configs/k2hk_evm.h | 15 --- include/configs/k2l_evm.h | 15 --- include/configs/ti_armv7_keystone2.h | 95 ------------------- include/environment/ti/ti_armv7_keystone2.env | 61 ++++++++++++ 11 files changed, 158 insertions(+), 181 deletions(-) create mode 100644 board/ti/ks2_evm/k2e_evm.env create mode 100644 board/ti/ks2_evm/k2g_evm.env create mode 100644 board/ti/ks2_evm/k2hk_evm.env create mode 100644 board/ti/ks2_evm/k2l_evm.env create mode 100644 include/environment/ti/ti_armv7_keystone2.env
diff --git a/board/ti/ks2_evm/Kconfig b/board/ti/ks2_evm/Kconfig index 9477f5336b8..8b3a43a5aa8 100644 --- a/board/ti/ks2_evm/Kconfig +++ b/board/ti/ks2_evm/Kconfig @@ -9,6 +9,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "k2e_evm"
+config ENV_SOURCE_FILE + default "k2e_evm" + endif
if TARGET_K2HK_EVM @@ -22,6 +25,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "k2hk_evm"
+config ENV_SOURCE_FILE + default "k2hk_evm" + endif
if TARGET_K2L_EVM @@ -35,6 +41,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "k2l_evm"
+config ENV_SOURCE_FILE + default "k2l_evm" + endif
if TARGET_K2G_EVM @@ -48,6 +57,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "k2g_evm"
+config ENV_SOURCE_FILE + default "k2g_evm" + endif
source "board/ti/common/Kconfig" diff --git a/board/ti/ks2_evm/k2e_evm.env b/board/ti/ks2_evm/k2e_evm.env new file mode 100644 index 00000000000..d8e02280370 --- /dev/null +++ b/board/ti/ks2_evm/k2e_evm.env @@ -0,0 +1,13 @@ +#include <environment/ti/ti_armv7_common.env> +#include <environment/ti/ti_armv7_keystone2.env> + +findfdt=setenv fdtfile ${name_fdt} +boot=ubi +args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048 +mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc) + +name_fdt=keystone-k2e-evm.dtb +name_mon=skern-k2e.bin +name_ubi=k2e-evm-ubifs.ubi +name_uboot=u-boot-spi-k2e-evm.gph +name_fs=arago-console-image-k2e-evm.cpio.gz diff --git a/board/ti/ks2_evm/k2g_evm.env b/board/ti/ks2_evm/k2g_evm.env new file mode 100644 index 00000000000..771ac931ba0 --- /dev/null +++ b/board/ti/ks2_evm/k2g_evm.env @@ -0,0 +1,46 @@ +#include <environment/ti/ti_armv7_common.env> +#include <environment/ti/ti_armv7_keystone2.env> +#include <environment/ti/mmc.env> + +set_name_pmmc=setenv name_pmmc ti-sci-firmware-k2g.bin +dev_pmmc=0 +get_pmmc_net=dhcp ${loadaddr} ${tftp_root}/${name_pmmc} +get_pmmc_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_pmmc} +get_pmmc_ramfs=run get_pmmc_net +get_pmmc_mmc=load mmc ${bootpart} ${loadaddr} ${bootdir}/${name_pmmc} +get_pmmc_ubi=ubifsload ${loadaddr} ${bootdir}/${name_pmmc} +run_pmmc=rproc init; + rproc list; + rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; + rproc start ${dev_pmmc} + +boot=mmc +console=ttyS0,115200n8 +bootpart=0:2 +bootdir=/boot +rd_spec=- +args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048 + +findfdt= + if test $board_name = 66AK2GGP; then + setenv name_fdt keystone-k2g-evm.dtb; fi; + if test $board_name = 66AK2GG1; then + setenv name_fdt keystone-k2g-evm.dtb; fi; + if test $board_name = 66AK2GIC; then + setenv name_fdt keystone-k2g-ice.dtb; fi; + if test $board_name = 66AK2GI1; then + setenv name_fdt keystone-k2g-ice.dtb; fi; + if test $name_fdt = undefined; then + echo WARNING: Could not determine device tree to use; fi; + setenv fdtfile ${name_fdt} + +mtdparts=spi1.0:1m(u-boot-spl)ro,-(misc) +name_mon=skern-k2g.bin +name_ubi=k2g-evm-ubifs.ubi +name_uboot=u-boot-spi-k2g-evm.gph +init_mmc=run args_all args_mmc +init_fw_rd_mmc=load mmc ${bootpart} ${rdaddr} ${bootdir}/${name_fw_rd}; run set_rd_spec +get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt} +get_kern_mmc=load mmc ${bootpart} ${loadaddr} ${bootdir}/${name_kern} +get_mon_mmc=load mmc ${bootpart} ${addr_mon} ${bootdir}/${name_mon} +name_fs=arago-base-tisdk-image-k2g-evm.cpio diff --git a/board/ti/ks2_evm/k2hk_evm.env b/board/ti/ks2_evm/k2hk_evm.env new file mode 100644 index 00000000000..c9ef56b74b8 --- /dev/null +++ b/board/ti/ks2_evm/k2hk_evm.env @@ -0,0 +1,13 @@ +#include <environment/ti/ti_armv7_common.env> +#include <environment/ti/ti_armv7_keystone2.env> + +findfdt=setenv fdtfile ${name_fdt} +boot=ubi +args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048 +mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc) + +name_fdt=keystone-k2hk-evm.dtb +name_mon=skern-k2hk.bin +name_ubi=k2hk-evm-ubifs.ubi +name_uboot=u-boot-spi-k2hk-evm.gph +name_fs=arago-console-image-k2hk-evm.cpio.gz diff --git a/board/ti/ks2_evm/k2l_evm.env b/board/ti/ks2_evm/k2l_evm.env new file mode 100644 index 00000000000..f78fc8ccc90 --- /dev/null +++ b/board/ti/ks2_evm/k2l_evm.env @@ -0,0 +1,13 @@ +#include <environment/ti/ti_armv7_common.env> +#include <environment/ti/ti_armv7_keystone2.env> + +findfdt=setenv fdtfile ${name_fdt} +boot=ubi +args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096 +mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc) + +name_fdt=keystone-k2l-evm.dtb +name_mon=skern-k2l.bin +name_ubi=k2l-evm-ubifs.ubi +name_uboot=u-boot-spi-k2l-evm.gph +name_fs=arago-console-image-k2l-evm.cpio.gz\0" diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 46e33233650..5cdd87c0a17 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -9,21 +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" \ - "mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc)\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 744f1539a37..2f25d393a37 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -9,47 +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" \ - "mtdparts=spi1.0:1m(u-boot-spl)ro,-(misc)\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 c688c4d738b..5e52bbb98f8 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -9,21 +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" \ - "mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc)\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 c0af0bc2fe5..199959fbd42 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -9,21 +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" \ - "mtdparts=spi0.0:1m(u-boot-spl)ro,-(misc)\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 06aa02a6d40..72c04d8a994 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -63,107 +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 " \ - "mtdparts=${mtdparts}\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> diff --git a/include/environment/ti/ti_armv7_keystone2.env b/include/environment/ti/ti_armv7_keystone2.env new file mode 100644 index 00000000000..c4f7843ab49 --- /dev/null +++ b/include/environment/ti/ti_armv7_keystone2.env @@ -0,0 +1,61 @@ +name_fw_rd=k2-fw-initrd.cpio.gz +set_rd_spec=setenv rd_spec ${rdaddr}:${filesize} +init_fw_rd_net=dhcp ${rdaddr} ${tftp_root}/${name_fw_rd}; run set_rd_spec +init_fw_rd_nfs=nfs ${rdaddr} ${nfs_root}/boot/${name_fw_rd}; run set_rd_spec +init_fw_rd_ramfs=setenv rd_spec - +init_fw_rd_ubi=ubifsload ${rdaddr} ${bootdir}/${name_fw_rd}; run set_rd_spec + +dfu_bufsiz=0x10000 +dfu_alt_info_mmc= + MLO fat 0 1; + u-boot.img fat 0 1; + uEnv.txt fat 0 1 + +bootdir=/boot +tftp_root=/ +nfs_root=/export +mem_lpae=1 +uinitrd_fixup=1 +addr_ubi=0x82000000 +addr_secdb_key=0xc000000 +name_kern=zImage +addr_mon=0x87000000 +addr_non_sec_mon=0x0c097fc0 +addr_load_sec_bm=0x0c09c000 +run_mon=mon_install ${addr_mon} +run_mon_hs=mon_install ${addr_non_sec_mon} ${addr_load_sec_bm} +run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr} +init_net=run args_all args_net +init_nfs=setenv autoload no; dhcp; run args_all args_net +init_ubi=run args_all args_ubi; ubi part ubifs; ubifsmount ubi:rootfs; +get_fdt_net=dhcp ${fdtaddr} ${tftp_root}/${name_fdt} +get_fdt_nfs=nfs ${fdtaddr} ${nfs_root}/boot/${name_fdt} +get_fdt_ubi=ubifsload ${fdtaddr} ${bootdir}/${name_fdt} +get_kern_net=dhcp ${loadaddr} ${tftp_root}/${name_kern} +get_kern_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_kern} +get_kern_ubi=ubifsload ${loadaddr} ${bootdir}/${name_kern} +get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon} +get_mon_nfs=nfs ${addr_mon} ${nfs_root}/boot/${name_mon} +get_mon_ubi=ubifsload ${addr_mon} ${bootdir}/${name_mon} +get_fit_net=dhcp ${addr_fit} ${tftp_root}/${name_fit} +get_fit_nfs=nfs ${addr_fit} ${nfs_root}/boot/${name_fit} +get_fit_ubi=ubifsload ${addr_fit} ${bootdir}/${name_fit} +get_fit_mmc=load mmc ${bootpart} ${addr_fit} ${bootdir}/${name_fit} +get_uboot_net=dhcp ${loadaddr} ${tftp_root}/${name_uboot} +get_uboot_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_uboot} +burn_uboot_spi=sf probe; sf erase 0 0x100000; sf write ${loadaddr} 0 ${filesize} +burn_uboot_nand=nand erase 0 0x100000; nand write ${loadaddr} 0 ${filesize} +args_all=setenv bootargs console=ttyS0,115200n8 rootwait mtdparts=${mtdparts} +args_net=setenv bootargs ${bootargs} rootfstype=nfs root=/dev/nfs rw nfsroot=${serverip}:${nfs_root},${nfs_options} ip=dhcp +nfs_options=v3,tcp,rsize=4096,wsize=4096 +get_fdt_ramfs=dhcp ${fdtaddr} ${tftp_root}/${name_fdt} +get_kern_ramfs=dhcp ${loadaddr} ${tftp_root}/${name_kern} +get_mon_ramfs=dhcp ${addr_mon} ${tftp_root}/${name_mon} +get_fit_ramfs=dhcp ${addr_fit} ${tftp_root}/${name_fit} +get_fs_ramfs=dhcp ${rdaddr} ${tftp_root}/${name_fs} +get_ubi_net=dhcp ${addr_ubi} ${tftp_root}/${name_ubi} +get_ubi_nfs=nfs ${addr_ubi} ${nfs_root}/boot/${name_ubi} +burn_ubi=nand erase.part ubifs; nand write ${addr_ubi} ubifs ${filesize} +init_ramfs=run args_all args_ramfs get_fs_ramfs +args_ramfs=setenv bootargs ${bootargs} rdinit=/sbin/init rw root=/dev/ram0 initrd=0x808080000,80M +no_post=1
On Tue, Jul 25, 2023 at 11:40:58AM -0500, Andrew Davis wrote:
This is more complex than it needs to be and makes converting these boards over to plain text env files more difficult. Simplify this environment variable scheme.
Signed-off-by: Andrew Davis afd@ti.com
include/configs/k2e_evm.h | 5 +---- include/configs/k2g_evm.h | 4 +--- include/configs/k2hk_evm.h | 5 +---- include/configs/k2l_evm.h | 5 +---- include/configs/ti_armv7_keystone2.h | 6 +----- include/environment/ti/spi.h | 14 -------------- 6 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 include/environment/ti/spi.h
So this unwinding isn't quite enough as the defconfigs also set CONFIG_MTDPARTS_DEFAULT and that's the best way.
On 7/25/23 12:18 PM, Tom Rini wrote:
On Tue, Jul 25, 2023 at 11:40:58AM -0500, Andrew Davis wrote:
This is more complex than it needs to be and makes converting these boards over to plain text env files more difficult. Simplify this environment variable scheme.
Signed-off-by: Andrew Davis afd@ti.com
include/configs/k2e_evm.h | 5 +---- include/configs/k2g_evm.h | 4 +--- include/configs/k2hk_evm.h | 5 +---- include/configs/k2l_evm.h | 5 +---- include/configs/ti_armv7_keystone2.h | 6 +----- include/environment/ti/spi.h | 14 -------------- 6 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 include/environment/ti/spi.h
So this unwinding isn't quite enough as the defconfigs also set CONFIG_MTDPARTS_DEFAULT and that's the best way.
The one in CONFIG_MTDPARTS_DEFAULT is different from the one defined in k2*_evm.h, so switching would change the env. This patch was attempting to make no changes.
Maybe a better question is do we need these anymore? They don't seem to do anything anymore and these partitions are board specific, so couldn't be set universally in defconfig anyway. Plus They are instead already defined (correctly too) in the DTS files for each board. Should we just drop mtdparts=?
Andrew
On Tue, Jul 25, 2023 at 12:47:10PM -0500, Andrew Davis wrote:
On 7/25/23 12:18 PM, Tom Rini wrote:
On Tue, Jul 25, 2023 at 11:40:58AM -0500, Andrew Davis wrote:
This is more complex than it needs to be and makes converting these boards over to plain text env files more difficult. Simplify this environment variable scheme.
Signed-off-by: Andrew Davis afd@ti.com
include/configs/k2e_evm.h | 5 +---- include/configs/k2g_evm.h | 4 +--- include/configs/k2hk_evm.h | 5 +---- include/configs/k2l_evm.h | 5 +---- include/configs/ti_armv7_keystone2.h | 6 +----- include/environment/ti/spi.h | 14 -------------- 6 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 include/environment/ti/spi.h
So this unwinding isn't quite enough as the defconfigs also set CONFIG_MTDPARTS_DEFAULT and that's the best way.
The one in CONFIG_MTDPARTS_DEFAULT is different from the one defined in k2*_evm.h, so switching would change the env. This patch was attempting to make no changes.
Maybe a better question is do we need these anymore? They don't seem to do anything anymore and these partitions are board specific, so couldn't be set universally in defconfig anyway. Plus They are instead already defined (correctly too) in the DTS files for each board. Should we just drop mtdparts=?
So, CONFIG_MTDPARTS_DEFAULT (and related) largely just results in setting mtdparts= in the default environment. So yes, if they're correct in the DTS files the best thing to do is remove the CONFIG options and remove the environment settings and then there won't be confusion about which one is the source of truth.
participants (2)
-
Andrew Davis -
Tom Rini