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 95EBEC433F5 for ; Fri, 8 Apr 2022 02:46:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA8E083DF2; Fri, 8 Apr 2022 04:45:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="ctOsO/nw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 659F383DEB; Fri, 8 Apr 2022 04:45:51 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::62b]) (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 5BCFB83DC4 for ; Fri, 8 Apr 2022 04:45:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KdwoOId84aKLPqkkDKrIWFBMQofSlRsmNZSoDzz8uFs9Leb2LcpwAJ7eT+nOuXpjjzeF4FOAfOfoYqHd9AivcQL0TQIIjxcEH4CRQ8E74Sl4IwVwaVAbtfgBTRKEiRjh7bCOLmSiR1ZTdspOjp/nEnS+VLmXmo37F7ZJbc1uxxH5+XqSBlS0VEcTknkrwfsAVVu+0AEpDHv784zguNYC64YSGQoBP8SsSIzmJzmhA1ptgrDIzQaSB4tM4+EqVftfOo6aXTzNZaxLOO0Bpz9Yd75Url7z9pASP3sczw+KQ9Wy27BAGcUjIW3HZ0i0KdHbDqpE97W6/rW6hBaEfFMCZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zoDOAZTRdawkV16XdyP570Yu9hRRom0CdRGI8bgY4gA=; b=axDyV11OsoBuAuwwvqoxSo7oG2efZLdJtIRScXnrv58eMhp9YevqF/5t2scqylVT5NuTkTk3Kdo5AwmHmi8w6FdcrN1Dj5qxa00/4N8ObSGitkaKa7K6MswHXWrkfISfSJ7XmfA7GXfXFvEJ8m22Hotsr4INzOPqxLvP4TVc9wwJnH9/8KS7lCWVUCKDv6bv0kMp5j+felv1TLeMHkg8K3x7MMiR5IqIkijPerlCO9BDOYJ28s2YAiA4MHNVQC5EuEc23AG6s4cxI5rpHD0W67NU5QOCbBQM4OHKA7aQZzZWsFETx9VADtSQU7UE089D7PsIRAskaJ+w2NpvFJQHBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zoDOAZTRdawkV16XdyP570Yu9hRRom0CdRGI8bgY4gA=; b=ctOsO/nwmxKvfr7epGDfNnwfK8zQOf4CsjUb/vdxTppNVKhRIorPP6zk16SeRiUCEVsut7ssPCvCNLXHNHXEqVTLYw6t+G8PQdy5N7N824CjA7nHOHqRi+b4kbzHLxeHkuS+/hTjnifUp+coRtyfTDG/QgD1F767Jt4i6YdGW6Y= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM4PR0401MB2385.eurprd04.prod.outlook.com (2603:10a6:200:53::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.25; Fri, 8 Apr 2022 02:45:42 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6%8]) with mapi id 15.20.5144.022; Fri, 8 Apr 2022 02:45:42 +0000 From: "Peng Fan (OSS)" To: marcel.ziswiler@toradex.com, hs@denx.de, agust@denx.de, oliver.graute@kococonnector.com, uri.mashiach@compulab.co.il, nikita@compulab.co.il, ageisreiter@dh-electronics.de, cniedermaier@dh-electronics.com, paul.liu@linaro.org, aford173@gmail.com, tharvey@gateworks.com, iliev@ronetix.at, festevam@gmail.com, marcofrk@gmail.com, alifer.wsdm@gmail.com, heiko.thiery@gmail.com, m.niestroj@grinn-global.com, alison.wang@nxp.com, open-source@softing.de, sbabic@denx.de, trini@konsulko.com Cc: u-boot@lists.denx.de, u-boot@dh-electronics.com, Peng Fan Subject: [PATCH 12/13] configs: drop CONFIG_MMCROOT Date: Fri, 8 Apr 2022 11:25:21 +0800 Message-Id: <20220408032522.3451-13-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220408032522.3451-1-peng.fan@oss.nxp.com> References: <20220408032522.3451-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0053.apcprd02.prod.outlook.com (2603:1096:4:54::17) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5eca07af-5d30-49dd-a74a-08da1909dfa2 X-MS-TrafficTypeDiagnostic: AM4PR0401MB2385:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: po9uQ+4fp8/e00CfBtV+pfWGxNuZLeQJfq0DYR9gMNUSYxtJmRpNqIvJ2LO6BCiuWrbeCN75nvL+1qAkoLVYdNti6esmsSktQqp8z3YcS3kPjBA9FTtgGPtxoufoOJ4wuVp2THTAEbpXDddA7OVreFVQghAue6Ku7e7UoI9lNspLM+A11TWBpq+cR2IIclEnzhL64HbvebX2nuzP/xxhKx8u8xy0TJfIz1uZxcQEGcB87v9G8sDOKsp8X+E87Mgg5ZIyRtkUE430oQ9WH4pNVzeC06n1WNy/3NILfktUNrn9jUfe+ap3M2qDXI4OzkGjG7J1/a8I5jiTRHI0Gtv2OHe4UHTA2EAK+QiDw6+Ev4qFZm52PnrgZv1KYiEecAEc+wgfn3GxY24zaogGOmZ6M0GXKYu/88XZfL/5yvx5NoMjIAg/b0/ybiuKL3QO/s6qp+cc8kyaGuZ4mzNuPRggNKk+9Fw0ve/DCVlTJKqE383HKwLEiFlU+q4ZZafPWcQgNg3bjM5lXY77Vr/sG/c+ZCLLbHzTipBYHv5An09Mqnr8/WXSFmN6F+GhThpXHQ7pP72UQQoVlh82Oa7VW/MvmOmCMIbUqD5vbeAh6bnLbIkqE/dUb825SObLl832mPmzA1HYwkYHMSCL5ayA640wMCJ5ssN3UrH8FoEv+Oc/AEcNDuTp+BWNEIkCFFX0PvL3+N3nM0haRnsRuGYBXnNF1ZIGSOlJOmzWPpZ3Zt/t7z8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6486002)(86362001)(316002)(66556008)(66476007)(66946007)(508600001)(8676002)(4326008)(7416002)(5660300002)(83380400001)(8936002)(30864003)(6666004)(2616005)(38350700002)(38100700002)(921005)(52116002)(186003)(26005)(6506007)(2906002)(6512007)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?76qRLPJDZeGRYlVqg5Ylv2eG7tHf+Mh/UWJAT4dkXfibujLcg5jqD0zDddAE?= =?us-ascii?Q?ed9eRvpvv45Vo5ko9q0kWElaZCrRcpGcVokSRez+sAqu6A0VDLT/LXrymPaf?= =?us-ascii?Q?zUDmZuo3GvZ6AewKZUb0/Gpdobguja4dCcj/t5gIJJPnG3WXzoMeMvtl0kRy?= =?us-ascii?Q?tnbSRahHaCxV7b6hxJlAeuDmWPOf9uvM4KCAS4NFmeNccAxC4ebBQu7NVXE2?= =?us-ascii?Q?ZXsvTgd0w9Jzci/6jTAP4LcpFv8b5rqUSB/T+emPNpY11nG1MHW+Vh15Uo64?= =?us-ascii?Q?orc7u4/GqpmmAN+Zsz/DTT9d406N2vCTSCVfbJMwcfJa0khkevHHvDf+N3he?= =?us-ascii?Q?Wu6PCA2tOSD7cxwxg5Vu969zp3RwbpDy2craGqV5AF3nocehrPoOyT3Nrfqy?= =?us-ascii?Q?QujKo2LH2i6J9WDy4Da5uDqOpavfTznigN8W2MiQ9AWmslyqqYGUU/f/sSvO?= =?us-ascii?Q?n2YF3CMedUzaBi2JkEEG18txNk7XjrmiA2iC406JNUseAwQTB0zHcQ01ZfsG?= =?us-ascii?Q?IQDt2E96CRUaR7GwrdrIve/t5kCqLnDYgLuE+ybNNCXYizXIerkngpkPh6Zy?= =?us-ascii?Q?8WipplRZbTCrzZfn2UkZrOZwyd4/JuHUZTLdFz7ssOLIlxIyRZlqC1rZGZV2?= =?us-ascii?Q?bqMQ7/KkEXHPrV7Eofvg0WiDJZzg+zXFw9YLgob0SBzxWamAdptdGSVFGqbI?= =?us-ascii?Q?aCLmGhmqeJqmSZ1yvoXZpWn9+hYAiKtXunBeeTZKJOIcpJw9yEeDgQCKYBRY?= =?us-ascii?Q?OotTvY2b1yFtY9dc7WOo448dVgMIom0OtMzbXfmgQFwBZORQMiHl7fXRc/G3?= =?us-ascii?Q?Y6m2o9Yqsb2OJ5gsDSfGIjvCDCIX+dsI0eeBSPRbHYAh9RICmtg1wAGeoIUI?= =?us-ascii?Q?zX2Lk+ZoCi8dUw4+WD7yIovHqxaYP1t08+j2Ip4LOy9EvNimN7Wupavp5lSk?= =?us-ascii?Q?8oJVU89SMcSMxa405jZFGgObua3J3SAMTdaNWOQAxz4MPOK6Q/qEJAQ0+1lW?= =?us-ascii?Q?jfdVlnq5YwR+OB9fnqJmg4Sx3SeiLDMqrgsCmk1EzoQdfSv4iQK9M4EhajOk?= =?us-ascii?Q?xZ8iS9QTHzq7kxdb3wc210sxOUAoCwfmWT5mjCN2vOdzEP+IvpfPNR3synsu?= =?us-ascii?Q?omUVB5nbU/Am3B1z8WWkYe+RITeBnTzgiXBCm4Br99hzFImeHunQHXyGhOv9?= =?us-ascii?Q?iYMslEn9nezuGVnjmIYOq1ZbQNpb0U9prChH4n4gvnZU9ybCaSa9Yhv8irjw?= =?us-ascii?Q?IAZoNaIY/4rSTpYTJI0J4D2uxDWz+ZAryuC/w0XtnkYof7o5C5Kx7ynr5xT/?= =?us-ascii?Q?TNSwrYQ6bjOeXpW+yV7dqTLQXt1pF4C9gEmEMOw7qmLVxV9CVFWbD5Ib4jIp?= =?us-ascii?Q?aaduNYGCdYiXeeBH+8e2WjWtG4W3n0w4kROZyycMqInaZoTls4cJowop7sLk?= =?us-ascii?Q?39ueYvxbHdGLVcO5lrpaF9ow6voqFZ1AddT056yrAHgQ/m+6KZBbFhJNKsIt?= =?us-ascii?Q?x5d2BOU+dLlGIa/THHEWWKMzphk9hER6kmau08NqFw2lrZrfO67zu6ox8Q7v?= =?us-ascii?Q?0MXpXgr1iLFwecDijUSFZTuKLtDd8qSGe6+cNxnxD36cxvTpv8tM9OeE4P2T?= =?us-ascii?Q?vmeeO4cW9anHDy7SR9MwB4P0dlCJB+Tw4XRrzDw6aRuacPZYOaKCMuE0k7TL?= =?us-ascii?Q?jIvQGBgz3plDTd4YMqWoFIZPpiV61uN5FhjcKRCjfhZM1ehm2aOD/DaYvBWC?= =?us-ascii?Q?MGD5klDtlA=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5eca07af-5d30-49dd-a74a-08da1909dfa2 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 02:45:42.6694 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: h2SyWS/bosyvj7s7c9gxyEX71kDPC3pKU+HLwBQNM+Vk3rgQ+OYbUZI7apiGhOH6Ie+2zaQ5EM8ZAggLMZ0eDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0401MB2385 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.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan CONFIG_MMCROOT is only used to set mmcroot, no need a dedicated macro. Script as below " for i in `ls include/configs/*.h` do mmcroot=`sed -n '/define.*MMCROOT/ p' $i | awk -F\" '{ print $2;}'` if [ ! -n "$mmcroot" ]; then continue fi sed -i '/define.*MMCROOT/ d' $i sed -i 's,\" CONFIG_MMCROOT \",'$mmcroot',g' $i done " Signed-off-by: Peng Fan --- include/configs/aristainetos2.h | 3 +-- include/configs/capricorn-common.h | 1 - include/configs/cgtqmx8.h | 3 +-- include/configs/cl-som-imx7.h | 1 - include/configs/imx7-cm.h | 3 +-- include/configs/imx8mm-cl-iot-gate.h | 3 +-- include/configs/imx8mm_evk.h | 3 +-- include/configs/imx8mn_evk.h | 3 +-- include/configs/imx8mp_evk.h | 3 +-- include/configs/imx8mp_rsb3720.h | 3 +-- include/configs/imx8mq_cm.h | 3 +-- include/configs/imx8mq_evk.h | 3 +-- include/configs/imx8mq_phanbell.h | 3 +-- include/configs/imx8qm_mek.h | 3 +-- include/configs/imx8qm_rom7720.h | 3 +-- include/configs/imx8qxp_mek.h | 3 +-- include/configs/imx8ulp_evk.h | 3 +-- include/configs/liteboard.h | 3 +-- include/configs/mx6sllevk.h | 3 +-- include/configs/mx6ul_14x14_evk.h | 3 +-- include/configs/mx6ullevk.h | 3 +-- include/configs/mx7ulp_com.h | 3 +-- include/configs/mx7ulp_evk.h | 3 +-- include/configs/phycore_imx8mm.h | 1 - include/configs/phycore_imx8mp.h | 1 - include/configs/pico-imx8mq.h | 3 +-- include/configs/xpress.h | 3 +-- 27 files changed, 23 insertions(+), 50 deletions(-) diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index ab20ad17b16..8ee97f1d4e3 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -26,7 +26,6 @@ #include "mx6_common.h" -#define CONFIG_MMCROOT "/dev/mmcblk0p1" /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR @@ -182,7 +181,7 @@ "${pubkey}\0" \ "mainRargs=setenv bootargs console=${console},${baudrate} " \ "rescue_sysnum=${rescue_sysnum} root=${emmcroot} rootfstype=ext4\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "mmcRargs=setenv bootargs console=${console},${baudrate} " \ diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 58d7a3a8ce2..08534cd1a30 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -109,7 +109,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 /* On CCP board, USDHC1 is for eMMC */ -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* eMMC */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index bd5c072382a..4b4694ec071 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -78,7 +78,7 @@ "fdt_file=imx8qm-cgt-qmx8.dtb\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ @@ -122,7 +122,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 8af80f58f8e..4b494d8aeef 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -104,7 +104,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ #endif /* USB Configs */ diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 46ca1c58145..2d9f8bb510b 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -31,7 +31,7 @@ "fdt_addr=0x83000000\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ @@ -83,7 +83,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ /* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index fcb0bd465ed..7a3db01f2c3 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -79,7 +79,7 @@ "bootm_size=0x10000000\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ @@ -131,7 +131,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 80851b66325..3392480a185 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -52,7 +52,7 @@ "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ /* Link Definitions */ @@ -63,7 +63,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index f969314d6b2..86b75ab4625 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -51,7 +51,7 @@ "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ /* Link Definitions */ @@ -62,7 +62,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 35fc27bb370..cc8d65cb54e 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -61,7 +61,7 @@ "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ /* Link Definitions */ @@ -72,7 +72,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ /* Totally 6GB DDR */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 62e06d23034..b80a5f91525 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -95,7 +95,7 @@ "bootm_size=0x10000000\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ @@ -146,7 +146,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ /* Totally 6GB or 4G DDR */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index a3bb3c9d291..989486aa6dc 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -55,7 +55,7 @@ "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ /* Link Definitions */ @@ -66,7 +66,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index c1660757d62..69bbb7bc69e 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -63,7 +63,7 @@ "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ /* Link Definitions */ @@ -74,7 +74,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 74447f92819..e2118e8c441 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -53,7 +53,7 @@ "initrd_high=0xffffffffffffffff\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ @@ -102,7 +102,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 8a269225778..9452ba56152 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -50,7 +50,7 @@ "initrd_high=0xffffffffffffffff\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ @@ -117,7 +117,6 @@ /* Default environment is in SD */ /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */ -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 7532c6e7551..04a2216fcd8 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -66,7 +66,7 @@ "initrd_addr=0x83800000\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ @@ -114,7 +114,6 @@ * USDHC3 is for SD on base board On DDR4 board, USDHC1 is mux for NAND, * USDHC2 is for SD, USDHC3 is for SD on base board */ -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_SDRAM_BASE 0x80000000 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 01577932884..c290c19c347 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -48,7 +48,7 @@ "initrd_high=0xffffffffffffffff\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ @@ -115,7 +115,6 @@ /* Default environment is in SD */ /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */ -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM_1 0x80000000 diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 40ab0e34c44..b8e63393449 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -59,7 +59,7 @@ "initrd_addr=0x83800000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \ /* Link Definitions */ @@ -68,7 +68,6 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk2p2" #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define PHYS_SDRAM 0x80000000 diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 290eba697a6..fdea7241b02 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -35,7 +35,7 @@ "ip_dyn=yes\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ @@ -100,7 +100,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* FLASH and environment organization */ -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USB Configs */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 0793028ba1f..1b32f58afca 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -25,7 +25,7 @@ "ip_dyn=yes\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ @@ -92,7 +92,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Environment organization */ -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index b960a41b710..03d799ce654 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -47,7 +47,7 @@ "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ @@ -121,7 +121,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* environment organization */ -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ /* USB Configs */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index dfcdc00c061..bc494b46b69 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -43,7 +43,7 @@ "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ @@ -118,7 +118,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* environment organization */ -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_IOMUX_LPSR diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index d3ba1449279..c790374d1a5 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -27,7 +27,6 @@ * write the direct value here */ #define CONFIG_BOARD_SIZE_LIMIT 785408 -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* Using ULP WDOG for reset */ #define WDOG_BASE_ADDR WDG1_RBASE @@ -51,7 +50,7 @@ "fdt_addr=0x63000000\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index e80d748d991..7644274d84b 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_BOOTM_LEN 0x1000000 -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ /* Using ULP WDOG for reset */ #define WDOG_BASE_ADDR WDG1_RBASE @@ -47,7 +46,7 @@ "ip_dyn=yes\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 528cda0dbe3..71f0c42ec0c 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index db530965a2a..0c963b62b3b 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 402d315d426..157486e2635 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -47,7 +47,7 @@ "initrd_high=0xffffffffffffffff\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ "loadbootscript=" \ @@ -81,7 +81,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index d7bb5715b60..bd39b328a67 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -34,7 +34,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Environment is in stored in the eMMC boot partition */ -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */ /* USB Configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET @@ -60,7 +59,7 @@ "ip_dyn=yes\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ -- 2.35.1