From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CFAB7C001DE for ; Tue, 25 Jul 2023 16:41:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C356286604; Tue, 25 Jul 2023 18:41:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="g6NR5OD1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B44E1866C1; Tue, 25 Jul 2023 18:41:07 +0200 (CEST) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 053FB8602A for ; Tue, 25 Jul 2023 18:41:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=afd@ti.com Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 36PGf0m3039629; Tue, 25 Jul 2023 11:41:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1690303260; bh=7XbhP72FPpiR2tJp25f9AKDHryDzvXfFyGIvEK8gq/M=; h=From:To:CC:Subject:Date; b=g6NR5OD1dx0D3cPfekYHj8SaEEWXUD0Wvqa4XPpi6BBuv1Y2paqq1UJfH82xg4Dzq VtFaBBlkcJmJ+sMxYGOiabKBXPAxSvYvK7IIwU53vYwbFCXzfSEsFtVwg22jB/scb3 cdMX9R8hkvJ22aKyIX54cvABf6zwYHlgL2bmMnpQ= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 36PGf0Hd016068 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Jul 2023 11:41:00 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Tue, 25 Jul 2023 11:41:00 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Tue, 25 Jul 2023 11:41:00 -0500 Received: from fllv0040.itg.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 36PGf0NA025014; Tue, 25 Jul 2023 11:41:00 -0500 From: Andrew Davis To: Simon Glass , Tom Rini , Nishanth Menon , Vignesh Raghavendra , CC: Andrew Davis Subject: [PATCH 1/2] configs: keystone2: Unwind KERNEL_MTD_PARTS definition Date: Tue, 25 Jul 2023 11:40:58 -0500 Message-ID: <20230725164059.593455-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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 --- 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 - /* 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 -#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 -#include /* 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 #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 - /* 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 -#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 - /* 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 -#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 -- 2.39.2