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 1BD9BC433F5 for ; Fri, 15 Apr 2022 03:46:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 42C9783ADD; Fri, 15 Apr 2022 05:45:18 +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="FV9fO7Yn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 69EA383DD9; Fri, 15 Apr 2022 05:45:16 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20608.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::608]) (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 E387083B4E for ; Fri, 15 Apr 2022 05:45:11 +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=ggHPxLOUGNraUnl/EnbdkWakYJYZOb+n37/A2sa1JG44ZkyYQ5xT0gUGkLIpo2SK1y5XkOOms+EY3nwoRKIu+28Wg/VOC91hUtZgUsTTLUJvlcdEEkHR4KqIygykG1FJnttF9HAbWO8dIVA/9l3FYZZhoGs06y5BOGx0Tsd/cx0AwOnFertP9jkaMGJzTjPjoqSCUSA+upi+nLXmrMLLNiafrKW1mUVofxZZFPCOZotylNmIHyPzhwHeuVDkGQyaVXOt+85PAnzf7YEoodWrtVKa5THmGo+yuZQCdkW2Gxjt+S9LBLDqhU9P/yWltOMjXVl2X43spA9D8MKXb+Wm9A== 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=k3WSHuQtc/jNWOB57eWvUVqlEQcl9KtzNKu35bSW+GI=; b=FpQrvt2qssEQmMIF35DT13hzIK3g9XN4PW9I+MsTw/QVUESX2WPm7ujcKc5zNCpj7TduaHOtB2Ix3FTvss/dU1ktdOsX1u+ATSV1XF3dbF4RNmN+ndMdEc/uywXlAWx5lv2xqRIOHq3+90ni3ZF2SCmKEnLanMtXNe6Yk2VO31+LJdhcryRUHuqF0Wx8jdyZoJeXqH4cMryXTNHhm3AcvGm465vHGNN8hu5lLDaG289gjeH0F9MRyNRNk1PbcbeBundY+Q6G7MVAlDVROsvVR3DIFOJrDTqerJo0akUIKuKytm6Onra7glEOnEZfvrwnMxHOjeQXvPL2tVggHpxbDw== 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=k3WSHuQtc/jNWOB57eWvUVqlEQcl9KtzNKu35bSW+GI=; b=FV9fO7YnHyQloZWyRqkrCUuE9axNxWl/M6vrO7XnDzrB7ky5F56KLigA2NAQIntJvbKVLVgkOgLgtlVHAi2qSf/INknTvBoiSF/BpTJe3mnXAp4rNRRqas0gzhbE44W/6Q9xbxoqh7d7DUPosWKlU8kTyyXJXbLrWgGnjI/uDRE= 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 PAXPR04MB8688.eurprd04.prod.outlook.com (2603:10a6:102:21f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 03:45:09 +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.029; Fri, 15 Apr 2022 03:45:09 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Heiko Schocher , Anatolij Gustschin , Oliver Graute , Uri Mashiach , "Ying-Chun Liu (PaulLiu)" , Peng Fan , Ilko Iliev , Marco Franchi , Alifer Moraes , Marcin Niestroj , Teresa Remmet , Marek Vasut Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH V2 10/12] configs: drop CONFIG_MMCROOT Date: Fri, 15 Apr 2022 12:23:41 +0800 Message-Id: <20220415042416.23611-11-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415042416.23611-1-peng.fan@oss.nxp.com> References: <20220415042416.23611-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0133.apcprd02.prod.outlook.com (2603:1096:4:188::18) 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: 9f2eb064-5750-429d-6cd0-08da1e925690 X-MS-TrafficTypeDiagnostic: PAXPR04MB8688: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: WTf008aecmpK9hmbeVA3RbKUPklkVuJu8nnBWCygg2QL1uRxFw7e0wSwBeiHwxqhAMS4GSuHDr1/in06Z8Tjp/65IizWSH1eYBLDs9cyPCLWiLT9mqxbH9pfh4PR6VMgKXjKNyKg0tZGVS+O1z0T5eeB1t34XgYOhnYEJiX/hpA40iCMgR5j/o6r57xeZqmbnHuPSOEZ0UuOlOb1bb7+QKxot0gpeARGBMvdE9RF1n+8HadYKpUvpaMZvGhSXB5xGi4pPwAaIEEbVPuFr2KsJDNOq3JVs1jXLhSHeNolO4KJyz/Kg3kbzLbcGLZEFLg3h24c/02XsitQZ07FlBhTDojzit4x2RPbo8CYTvFQ2OoxbA5QOtdXvNBhqNnThhoOJvPh7MLzjhWgvvvr0f18pInc74PLVyhPv6zDwNJ35uqjEAnDT20Vq6M9Jn3JywwgTdgOn8rfO8+NogSouGdBzTXSGfS3U1/Zu+rGtaOA3CWT348zVjwZR5QeV6A1oqXnQ2iGReo/fi58kj8oKkB4tWu4m487llpfM2fyA3JUzqc+bKHzp3oOCrG47P3c6h6cTbxy1hA5cq0Qg8Cd/MIq4NqNvsJRBmvnDXCzb/FeB1aNF+dP1TjBbbbjvZwSN+6ajJxQA31vyt7046qllSo1k98pFaEIjaXvxJ17OPLytKVB0rge0BNStjSF58s4brd7p/Mv0NheSwua+1aHJAtc/+zTTAGI3W5V4/S9cpXUeVo= 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)(86362001)(6666004)(52116002)(38100700002)(6512007)(26005)(38350700002)(6506007)(921005)(4326008)(2906002)(508600001)(66556008)(66476007)(66946007)(8676002)(6486002)(83380400001)(5660300002)(8936002)(316002)(2616005)(30864003)(1076003)(186003)(110136005)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eKF0klEyLjdI9QaXHvLK25/KVf+CHEygRub0ldIdRky/v/JNdn+bvnhgBFue?= =?us-ascii?Q?SHLkS7JgeMovjNZiRpkKmL3CXoDs31WSp7EdXUS3dmf4bMk0wcpi46HHj6GD?= =?us-ascii?Q?Qo0bDNZ6QUbAwuvgr1H5ffNvyqxoSEi+I+kFU3nC2mMOSESWIFlqCLd7CqAx?= =?us-ascii?Q?poq+t/0Wa9K14iGT+isyXfZMe59TQ+DII22s4qKa3rnhJ3UHao1WIN+vio3G?= =?us-ascii?Q?2Dbd4UarKF2lxeTHSl6tYVcEuogaaNlWHpTjAJd0uqaTewTbsIBICSDuhzrM?= =?us-ascii?Q?a+EbBnFK2G5EL30HgL1klwhbIMIT/F65R+ePGmzJO5P4U03XdkidlhQHnEta?= =?us-ascii?Q?dzLbnUfKq2+dgkTPQoG2Q4kwcncxSKwSOEYW3JrhFmPgyliPShh5rTu9HOoQ?= =?us-ascii?Q?ChYbkKd7moc2ZHdOymS5IyIlP0jjKhjcHCbvBHDpUc+3fSeyAPw4qGH1XMK6?= =?us-ascii?Q?cqTf1Ay4a09cWDQpZp2eVaK4FrPwRptroax3NdB+IaRpXm5hJF7Ww2JkOv+V?= =?us-ascii?Q?Z3Y/y+eTbTfQr/0m3WRTFjQXSUvio/GiPFwzIu0185BErV7U5vT3p14OWNVv?= =?us-ascii?Q?uCtxkmdQuD1rxleR9dAGj0dsBdMPYRTIL+drh+wXwsmf7m1CxjU8FIuknqnm?= =?us-ascii?Q?YQxyGo3LL/NTItnEDK3DdoLGg4PYrS2d8rexzZgT3+cw01S6UYGV+QsnwPb+?= =?us-ascii?Q?uucwP8Tf+3LsqYkRYtYovOVWMEK70+ws1u8p6mjhWGtWPbM89cxOCYrTPG2c?= =?us-ascii?Q?NUcQWqoMeXn6T+fCiUTU8Cz+2hxRwsI3w9UdHYg2URnCUTscKEL6kwJdocpq?= =?us-ascii?Q?Srrz4O9EU6eklWcSfCmMi2I9/IwYQzXwpy/ZEj6wF9lxaqG92TOMbm2RrmbW?= =?us-ascii?Q?2Il8Whd+QaWfuZQxDY+Bt9y65Ka/a27IsepYI27xgy0p27657d+Phxb+75TD?= =?us-ascii?Q?kr80CSWF8HzaO+qlUgTCVH4NL2opDV9p48fu5WmYGztNCvZFmF7Y1dqvO1Zn?= =?us-ascii?Q?e4rJ9nj+3ofEyVW0K3Ru2oyr0kDaZsjSv80vnMouOwhw9E5h1c06DW8Wdv2R?= =?us-ascii?Q?yeI8PT5vhu1dxkvp7Hv36Bd0U74Gj2d/9AItyp+0yQ1DytnXj9In7KxPCCd1?= =?us-ascii?Q?pI4p2JCdCLo2eNLcDM8jTICQ/cSx/ajZ1a6uA2KBVTP/U3TIgLhlfOTyOQd2?= =?us-ascii?Q?EIZJAg7Ce+gb/ZcvsrIC8VdqVLHTMe0KnnUqFOtVe65wstTYiYhSBElF5hdz?= =?us-ascii?Q?uu9aUTLJIpjZoYyfk3Gv6eh4T0fHQTRQ/5l9qHn8kyPY5ew0WpqriY3TZyra?= =?us-ascii?Q?+hR+HqcN+23a7iRue+8UcR1aszvRILGvFw7Apsdxhh/qPOkt+AxEXwBE9ZUl?= =?us-ascii?Q?KytpeGzcswpva3ZPfX58e3IIkz0jmsz72o8r3ux4bYiC3ROb98vsCp0AMIuu?= =?us-ascii?Q?TRKu/ZRJA+0i2nYLDeFIQE5unPVaf4NFcgXTRGHIMfJa3bmlGSj69tANLzwG?= =?us-ascii?Q?vGj69ACTWgS+GpNSQUndM6aMD6oCPLkhRPbsKDwtXizf6fjNVUcAFqh84QbS?= =?us-ascii?Q?Dxso1UBY43/OiH00Vn5JDC+TnkLUFO/rQa7KoIEhx8su/S5LhGjvCKKS+lAw?= =?us-ascii?Q?5GQAOs7WKRHmUvM6kIMz6+1zbXSKyP7R8mjD1Yl61L6RY2CyBRBx4Qon3t1f?= =?us-ascii?Q?O0/1Sfln/SDTJFSGgVFU7uNWSk/9aNld3etQUStUXcCfgPv15hEk8unIU6Nk?= =?us-ascii?Q?g5B8tyocTA=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f2eb064-5750-429d-6cd0-08da1e925690 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 03:45:09.5522 (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: MMPQpSJ82DWo7AHfZbz9Eob/YDIARZVBm8LLIQWM7mHQBnotVTZOoV3CL2ZrgAyp3QSWVfJSAjGHfZv70ifowg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8688 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 " Reviewed-by: Fabio Estevam 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 | 13 +++++++++++-- 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, 33 insertions(+), 50 deletions(-) diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 611b6d724e1..0dcd4cae2fa 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 @@ -183,7 +182,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 14d3f3cac65..05fe2444f53 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 f4b6353ea85..42b78485cfc 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 94886fa268c..f7929e5867e 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -62,7 +62,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 */ @@ -73,7 +73,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 ef5992d7c39..f6410114b76 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -52,7 +52,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" \ @@ -101,7 +101,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 f078c37c2de..46cba330b23 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -58,7 +58,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 */ @@ -67,7 +67,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 d0960bcaf9a..e8fd4e7a8e8 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 17e7ae0b4cc..72554d18b0a 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 ce6afcde2a0..c790374d1a5 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -17,7 +17,16 @@ #define CONFIG_SYS_BOOTM_LEN 0x1000000 -#define CONFIG_MMCROOT "/dev/mmcblk0p2" +/* + * Detect overlap between U-Boot image and environment area in build-time + * + * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot-dtb.imx offset + * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 + * + * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so + * write the direct value here + */ +#define CONFIG_BOARD_SIZE_LIMIT 785408 /* Using ULP WDOG for reset */ #define WDOG_BASE_ADDR WDG1_RBASE @@ -41,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 495fddf248d..95845276e7b 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -46,7 +46,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=" \ @@ -80,7 +80,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 13cfa2cd4bd..43b67a355b1 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 @@ -61,7 +60,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