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 6151CC433EF for ; Thu, 21 Apr 2022 13:19:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9EA383C58; Thu, 21 Apr 2022 15:19:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1650547169; bh=ubOmWOQP4ZcpyIW+rgMoA3HDLu3YwL/C33Q77n1mg+I=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=imU1UJ+/OfIW7pdIwPJiVCu3rjIqs02oYjaeHgxriFFzPIVyhaHjfGGXc6oncyf3c MDjVh3X8dBGJ2UIshnOt60kVeB2HkvHA8Rvn5x2VHjXQJ5ZvlLaycq0vfPp0Bvj9nR RM/D/Y1pyXM1DqcT5YkJc5lusKuBBoPhVx0Go2TfyRTNT181nUTo7tuofpyPIk0103 wXoZ8WKwp4ISk/E1iQemuI2CiUxvNEunfWbRRhSzvrF4EBI/IGnK+gZWd0cf4CcY4u XbSJVoQoUFCCH8H3B0sbOjW1dE8MsAWhzjWbebA0+ufX3ljJ5+ZDhuRh0JQO6NuYhF RzK4yT649Vr/Q== Received: from [IPV6:2001:a61:618e:a001:2d49:9f92:29db:14f9] (unknown [IPv6:2001:a61:618e:a001:2d49:9f92:29db:14f9]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbabic@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id F13D180331; Thu, 21 Apr 2022 15:19:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1650547167; bh=ubOmWOQP4ZcpyIW+rgMoA3HDLu3YwL/C33Q77n1mg+I=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=pITbQP0Lwj1qeZtuG/Gzannoua3L3D2DhOJP1P/QF6T0HmPgo/SZTYg5iTRZeVpeR GqTmqXR/lZGdwsgu37V1NLDukn5Cqzh+A7gaLmjkx/5DVrWYOXCuzqWSXWYM01gmCu I7g4IMI4xTZb6mAdL2Q3fAkBiuRMILOucSC8nRntDrI2fUlfmwcs0I+zLGG/j1QYCr McyESNIgqBqG6m5tc2TC1xaHMKCxnnb1UGoiqGoX8OJUYO5cmI4gzmQwQeg8/D2gP3 bpoZRzuSAgk//XgzYWs3prslg/z4vdiSzVZOCCsQh6GACKykv65afjGIYW4FTSOwQt rPCj6e0s0KKEw== Message-ID: <404e1baa-7d4a-71a6-010b-e18fa0bd3aa3@denx.de> Date: Thu, 21 Apr 2022 15:19:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH V2 10/12] configs: drop CONFIG_MMCROOT Content-Language: de-DE To: "Peng Fan (OSS)" , 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 References: <20220415042416.23611-1-peng.fan@oss.nxp.com> <20220415042416.23611-11-peng.fan@oss.nxp.com> <4a376923-651b-b0cb-f7a9-5d2e6393e3ec@denx.de> From: Stefano Babic In-Reply-To: <4a376923-651b-b0cb-f7a9-5d2e6393e3ec@denx.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 On 21.04.22 15:16, Stefano Babic wrote: > On 15.04.22 06:23, Peng Fan (OSS) wrote: >> 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 >> " > > ...but if this is generated by a script.... > >> >> 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 > > ..how is it possible that CONFIG_BOARD_SIZE_LIMIT is added ? > > This does not belong to the series, and it should not be here but in > configs/ Anyway, just take care of CONFIG_BOARD_SIZE_LIMIT - I drop the line above myself by applying this patch. Best regards, Stefano > > >>   /* 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" \ > > -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de =====================================================================