configs: keystone2: Unwind KERNEL_MTD_PARTS definition
PATCH v2 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. Remove setting mtdparts as the DTS already contain the partitions. While here also drop the conflicting definitions from the K2 defconfigs.
---
Changes for v2:
- Remove mtdparts completely for K2
configs/k2e_evm_defconfig | 1 - configs/k2e_hs_evm_defconfig | 1 - configs/k2g_evm_defconfig | 1 - configs/k2g_hs_evm_defconfig | 1 - configs/k2hk_evm_defconfig | 1 - configs/k2hk_hs_evm_defconfig | 1 - configs/k2l_evm_defconfig | 1 - configs/k2l_hs_evm_defconfig | 1 - include/configs/k2e_evm.h | 4 ---- include/configs/k2g_evm.h | 3 --- include/configs/k2hk_evm.h | 4 ---- include/configs/k2l_evm.h | 4 ---- include/configs/ti_armv7_keystone2.h | 7 +------ include/environment/ti/spi.h | 14 -------------- 14 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 include/environment/ti/spi.h
configs/k2e_evm_defconfig +0 -1
@@ -58,7 +58,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y
configs/k2e_hs_evm_defconfig +0 -1
@@ -34,7 +34,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y
configs/k2g_evm_defconfig +0 -1
@@ -56,7 +56,6 @@ CONFIG_CMD_REMOTEPROC=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y
configs/k2g_hs_evm_defconfig +0 -1
@@ -33,7 +33,6 @@ CONFIG_CMD_REMOTEPROC=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_LIST="keystone-k2g-generic keystone-k2g-evm keystone-k2g-ice"
configs/k2hk_evm_defconfig +0 -1
@@ -58,7 +58,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y
configs/k2hk_hs_evm_defconfig +0 -1
@@ -34,7 +34,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y
configs/k2l_evm_defconfig +0 -1
@@ -58,7 +58,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y
configs/k2l_hs_evm_defconfig +0 -1
@@ -35,7 +35,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y
include/configs/k2e_evm.h +0 -4
@@ -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 \
@@ -27,8 +25,6 @@#include <configs/ti_armv7_keystone2.h> -#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS -/* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 9
include/configs/k2g_evm.h +0 -3
@@ -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 \
@@ -54,8 +53,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 */
include/configs/k2hk_evm.h +0 -4
@@ -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 \
@@ -27,8 +25,6 @@#include <configs/ti_armv7_keystone2.h> -#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS -/* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 5
include/configs/k2l_evm.h +0 -4
@@ -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 \
@@ -27,8 +25,6 @@#include <configs/ti_armv7_keystone2.h> -#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS -/* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 5
include/configs/ti_armv7_keystone2.h +1 -6
@@ -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" \
@@ -148,8 +144,7 @@"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 " \ -KERNEL_MTD_PARTS \ +"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" \
include/environment/ti/spi.h deleted +0 -14
@@ -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
Signature · 1 line
2.39.2
PATCH v2 2/2 configs: keystone2: Change to using env files
Move to using .env file for setting up environment variables for K2x_evm.
--- board/ti/ks2_evm/Kconfig | 12 +++ board/ti/ks2_evm/k2e_evm.env | 12 +++ board/ti/ks2_evm/k2g_evm.env | 45 +++++++++ board/ti/ks2_evm/k2hk_evm.env | 12 +++ board/ti/ks2_evm/k2l_evm.env | 12 +++ include/configs/k2e_evm.h | 14 --- include/configs/k2g_evm.h | 40 -------- include/configs/k2hk_evm.h | 14 --- include/configs/k2l_evm.h | 14 --- include/configs/ti_armv7_keystone2.h | 94 ------------------- include/environment/ti/ti_armv7_keystone2.env | 61 ++++++++++++ 11 files changed, 154 insertions(+), 176 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
board/ti/ks2_evm/Kconfig +12 -0
@@ -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"
board/ti/ks2_evm/k2e_evm.env new file +12 -0
@@ -0,0 +1,12 @@ +#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 + +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
board/ti/ks2_evm/k2g_evm.env new file +45 -0
45 lines not on this page · raw message
board/ti/ks2_evm/k2hk_evm.env new file +12 -0
@@ -0,0 +1,12 @@ +#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 + +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
board/ti/ks2_evm/k2l_evm.env new file +12 -0
@@ -0,0 +1,12 @@ +#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 + +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"
include/configs/k2e_evm.h +0 -14
@@ -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 */
include/configs/k2g_evm.h +0 -40
@@ -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 */
include/configs/k2hk_evm.h +0 -14
@@ -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 */
include/configs/k2l_evm.h +0 -14
@@ -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 */
include/configs/ti_armv7_keystone2.h +0 -94
106 lines not on this page · raw message
include/environment/ti/ti_armv7_keystone2.env new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.39.2
Re: [PATCH v2 2/2] configs: keystone2: Change to using env files
Quoted 3 lines · Andrew Davis
Move to using .env file for setting up environment variables for
K2x_evm.Signed-off-by Andrew Davis <[email protected]>
Signature · 1 line
Tom
Re: [PATCH v2 2/2] configs: keystone2: Change to using env files
In reply to Andrew DavisQuoted 4 lines · Andrew Davis
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]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 6 lines · Andrew Davis
This is more complex than it needs to be and makes converting these boards over to plain text env files more difficult. Remove setting mtdparts as the DTS already contain the partitions. While here also drop the conflicting definitions from the K2 defconfigs.
Signed-off-by Andrew Davis <[email protected]>
Signature · 1 line
Tom
Quoted 7 lines · Andrew Davis
This is more complex than it needs to be and makes converting these boards over to plain text env files more difficult. Remove setting mtdparts as the DTS already contain the partitions. While here also drop the conflicting definitions from the K2 defconfigs.
Signed-off-by Andrew Davis <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom