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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F8C6C433EF for ; Tue, 5 Oct 2021 12:37:25 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4CDE9617E3 for ; Tue, 5 Oct 2021 12:37:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4CDE9617E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=foss.st.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 74A24829C7; Tue, 5 Oct 2021 14:37:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foss.st.com header.i=@foss.st.com header.b="06QsAmOX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B268881E14; Tue, 5 Oct 2021 14:37:20 +0200 (CEST) Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) (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 B3571829C7 for ; Tue, 5 Oct 2021 14:37:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=491232a075=patrick.delaunay@foss.st.com Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19596F7A000790; Tue, 5 Oct 2021 14:37:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : references : in-reply-to : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=selector1; bh=NIjXL34UdNQcvRcR+974j24Li/AQzIRFlkNrrIBRprc=; b=06QsAmOXb5jkEwAklD8C9DQyq09KjJDGifLw4zpXllqrBai98wN3ZMzAIJ9Au0deYwNN OoV7ReOeXsx/zQuwEOsDhnmlhEyRYBzxlTd3hymkFrQOtg8HawyoiNLU55YpCVEUdzdJ cOexJvjN5oLAjsgmUOTxHMhwa/6L8wRZhpJ3oXMV3dXfnMYEg1V4aM2+7BS7x4O9hJPZ EFY1av3KqNfOHS67pXZFSzH9iapZbbsp4SZLSkFS+PxVw0MGXRKZym2rBB5EShM1jjhc MQqeFDZOGBd1FIXKS+Kosaes5AbiN926Q3Jm3zL0cxJK8VCU9PHfyCU/sAGtH5HZNFQ6 BA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 3bgksh938x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 Oct 2021 14:37:14 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 850A810002A; Tue, 5 Oct 2021 14:37:12 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id CBBBC22BD04; Tue, 5 Oct 2021 14:37:12 +0200 (CEST) Received: from LMECWL0930 (10.75.127.45) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 5 Oct 2021 14:37:11 +0200 From: To: 'Marek Vasut' , CC: 'Patrice Chotard' References: <20211004114808.11553-1-marex@denx.de> <5f418176-394c-9fa5-794c-bca4006e9a63@foss.st.com> <946b7bea-9bb2-5c36-0706-c530e78d497e@denx.de> In-Reply-To: <946b7bea-9bb2-5c36-0706-c530e78d497e@denx.de> Subject: RE: [PATCH] Revert "configs: stm32mp1: only support SD card after NOR in bootcmd_stm32mp" Date: Tue, 5 Oct 2021 14:37:09 +0200 Message-ID: <000b01d7b9e5$b879fa50$296deef0$@foss.st.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 16.0 Content-Language: fr Thread-Index: AQNE6O7/+e8eUNsym1BDWrqwOpvu/gI/zLTVAxSFiFuov1Hi0A== msip_labels: MSIP_Label_23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0_Enabled=true; MSIP_Label_23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0_SetDate=2021-10-05T12:37:09Z; MSIP_Label_23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0_Method=Standard; MSIP_Label_23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0_Name=23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0; MSIP_Label_23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0_SiteId=75e027c9-20d5-47d5-b82f-77d7cd041e8f; MSIP_Label_23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0_ActionId=64ed6bb1-3a39-4127-9833-79e053b9e16c; MSIP_Label_23add6c0-cfdb-4bb9-b90f-bf23b83aa6c0_ContentBits=2 X-Originating-IP: [10.75.127.45] X-ClientProxiedBy: SFHDAG2NODE2.st.com (10.75.127.5) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-10-05_01,2021-10-04_01,2020-04-07_01 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Hi, ST Restricted > -----Original Message----- > From: Marek Vasut > Sent: lundi 4 octobre 2021 18:45 > To: Patrick DELAUNAY ; = u-boot@lists.denx.de > Cc: Patrice Chotard > Subject: Re: [PATCH] Revert "configs: stm32mp1: only support SD card = after > NOR in bootcmd_stm32mp" >=20 > On 10/4/21 6:34 PM, Patrick DELAUNAY wrote: > > Hi, >=20 > Hi, >=20 > > On 10/4/21 1:48 PM, Marek Vasut wrote: > >> This reverts commit d5d726d3cc47691ace3c68fa31147ad104aaf579, > >> which breaks boards which ship with multiple SD/eMMC sockets. > >> > >> This stm32mp1.h config is not used only by the ST reference boards, > >> but all the other STM32MP1 based boards in U-Boot, so changes to = this > >> stm32mp1.h cannot break the other boards. > >> > >> Signed-off-by: Marek Vasut > >> Cc: Patrice Chotard > >> Cc: Patrick Delaunay > >> --- > >> NOTE: I think we might need to split out the env for different > >> boards into different headers instead. Thoughts ? > >> --- > >> include/configs/stm32mp1.h | 4 +--- > >> 1 file changed, 1 insertion(+), 3 deletions(-) > >> > >> diff --git a/include/configs/stm32mp1.h = b/include/configs/stm32mp1.h > >> index 973a4f1d4b8..a75ed693f57 100644 > >> --- a/include/configs/stm32mp1.h > >> +++ b/include/configs/stm32mp1.h > >> @@ -120,7 +120,7 @@ > >> * for serial/usb: execute the stm32prog command > >> * for mmc boot (eMMC, SD card), boot only on the same device > >> * for nand or spi-nand boot, boot with on ubifs partition on UBI > >> partition > >> - * for nor boot, use SD card =3D mmc0 > >> + * for nor boot, use the default order > >> */ > >> #define STM32MP_BOOTCMD "bootcmd_stm32mp=3D" \ > >> "echo \"Boot over ${boot_device}${boot_instance}!\";" \ @@ > >> -133,8 +133,6 @@ > >> "if test ${boot_device} =3D nand ||" \ > >> " test ${boot_device} =3D spi-nand ;" \ > >> "then env set boot_targets ubifs0; fi;" \ > >> - "if test ${boot_device} =3D nor;" \ > >> - "then env set boot_targets mmc0; fi;" \ > >> "run distro_bootcmd;" \ > >> "fi;\0" > > > > > > Reviewed-by: Patrick Delaunay > > > > > > Sorry to break your board, but I assumed the "stm32mp1.h" was only = the > > default ST configuration >=20 > No worries really. No, it isn't only for the ST evalboards, and I = don't know whether > this is the right approach. >=20 > > for ST boards and other boards need to be overridden it if it is not > > align with their needs > > > > as I don't know the expected boot sequence. > > > > for example with: > > > > CONFIG_BOOTCOMMAND=3D"run bootcmd_dh_stm32mp" > > > > with bootcmd_dh_stm32mp to be defined > > > > > > but today this file is a mix between SOC configuration (generic) and > > ST boards needs. > > > > > > So I will merge your revert and I will push a other solution to only > > support SD card > > > > after NOR in bootcmd_stm32mp but only for STMicroelectronics boards > > > > (because the revert now break the EV1 boot from NOR). > > > > 1) stm32mp1.h =3D common for SOC STMP15x (as today) > > > > 2) st_stm32mp1.h =3D ST boards configuration (override common) >=20 > Maybe the naming should be the other way around, so we have some sort = of > namespacing, like this: >=20 > stm32mp1_common.h > ... common stuff for all boards and SoM and all ... >=20 > stm32mp1_st_evalboard.h (or whatever you want to call it) #include > #define custom ST env ... >=20 > stm32mp1_dh_dhsom.h > #include > #define custom DH env ... >=20 > That's what imx does , except for the namespacing, so the file names = are a mess. > I think we can do better there. So anything related to stm32mp1 should = have > stm32mp1_* filename prefix, and then some vendor_ or board_ suffix. Agree it is better and more coherent. I wasn't want to change the dh files,=20 but I will do it:=20 configs/stm32mp1_common.h or stm32mp15_common.h configs/stm32mp1_dh_dhsom.h (as you proposed) or=20 stm32mp15_dh_dhsom.h configs/stm32mp1_st_stm32mp15.h or=20 stm32mp15_st_common.h or stm32mp15_st_boards.h (name to be confirmed) with - stm32mp1_* filename prefix for STM32MP1 Series (Cortex arm v7) - stm32mp15_* filename prefix for STM32MP15x lines - stm32mp13_* filename prefix for STM32MP13x lines (coming soon =3D> = https://lwn.net/Articles/864174/) Regards Patrick