]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
configs: keystone2: Unwind KERNEL_MTD_PARTS definition
authorAndrew Davis <afd@ti.com>
Tue, 25 Jul 2023 18:15:20 +0000 (13:15 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 28 Jul 2023 14:11:01 +0000 (10:11 -0400)
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 <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
14 files changed:
configs/k2e_evm_defconfig
configs/k2e_hs_evm_defconfig
configs/k2g_evm_defconfig
configs/k2g_hs_evm_defconfig
configs/k2hk_evm_defconfig
configs/k2hk_hs_evm_defconfig
configs/k2l_evm_defconfig
configs/k2l_hs_evm_defconfig
include/configs/k2e_evm.h
include/configs/k2g_evm.h
include/configs/k2hk_evm.h
include/configs/k2l_evm.h
include/configs/ti_armv7_keystone2.h
include/environment/ti/spi.h [deleted file]

index 6d9d82594e18f36268f8ac47e80afdd3c4db2f57..44bed00ec9736f39f6735fc40537e3234a802b0d 100644 (file)
@@ -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
index c782bf118308e7304478142c5a5ca707ebb2bbf8..55c0182f8749e6b167da2a261303278cd0976f99 100644 (file)
@@ -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
index 756e7502a19d3b3e2c4e2a772578c7d6526bbfd4..45c7fade320dc97f51590d5e6ccff74658e0b0c8 100644 (file)
@@ -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
index f0de3232e9d8f38914c127c2d391cf3b7f878c8d..54a980cab54726ca623c5cd307279a0db70957d7 100644 (file)
@@ -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"
index 74ef0668d8622844d612e820a17159177a70b9ce..a26517804846ff399fa2fd5b35c32036959041b4 100644 (file)
@@ -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
index 5bd8c28f546d1a002716f9a62f1ee043800e9cdd..8c0472dcc2b9c57e0ae4a2539a0bcca5bde010dd 100644 (file)
@@ -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
index 378a71f94e1a995d6655886ae4313dd390c7296c..55ddd3cce96a60f85dbdba004a91e7b5d0edcd1e 100644 (file)
@@ -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
index 31ec3029d76f238a56b39da6704d1a214d17ca30..ce7aa3a39ef30f47b78262769c32209040820666 100644 (file)
@@ -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
index 630dfdc5b7fd06361cca82390ad83b0f499ab6da..604b85084ca6d7268640138041cd7148b7ed72a6 100644 (file)
@@ -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
 
index d0634a99f4920a0964987ece980d0c1f8f34215e..186145edc4c0c03468aaa68f1e4e26626fe8fabf 100644 (file)
@@ -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 */
index ed54be839ff0ff1e5d51ddcd1de0a56745d5b070..44a47995b739fbcbc0808de3119a7ac371261d40 100644 (file)
@@ -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
 
index 69d42eaf9f1620db523e234336061f9f09445e82..43d4049cd9c241e246b702c4d88dc558080e3ddc 100644 (file)
@@ -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
 
index a47f0902a267e556e6617cbddbeee088693d265f..586ccaacd3f29041744fa9a538a7d9ef399e4d76 100644 (file)
 
 /* 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"            \
                "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"                              \
diff --git a/include/environment/ti/spi.h b/include/environment/ti/spi.h
deleted file mode 100644 (file)
index 1681dc8..0000000
+++ /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