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 38AF0C433EF for ; Mon, 22 Nov 2021 08:10:07 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A6A7E836BC; Mon, 22 Nov 2021 09:10:04 +0100 (CET) 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="gt20JGZU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35D58836BC; Mon, 22 Nov 2021 09:10:02 +0100 (CET) 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 E45E483711 for ; Mon, 22 Nov 2021 09:09:56 +0100 (CET) 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=5960d79c8b=patrice.chotard@foss.st.com Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AM7j7jd008667; Mon, 22 Nov 2021 09:09:25 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=JkykyutCvcmigfbHBq6BnSU804qGLgLOC3xxMcRnVc8=; b=gt20JGZUsZOMjy1LS4G66Y/6dNkTC2ZCwqL6A9yZS0NrIe0aDAnoQZc9332RdeMXQZ2I McZeJSBlY6SaMwigRtnFmvdCqmDKlpmYHkxPisw0TBvNFSZaBUkbaHPM8Wym9owqgSBx 8Ogp7qDtUv5sPZFJhQBna64wcUb6aAuzkUJAYhLZTml61uLFMflF8guyAxDxX38j7Akz dYgSV2DDWmSaXZxFNq6CJ5wi+YaTdHFGRZGcP4OjbOimhjjRctt2SzlnTt8Fu92yOTbd G7dQXdF7h3Iw89RELECEkoNEBocOOWp+gH2hJohYwUYw3+22N7QRhHCFoVudD+AtDESx iw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3cg73g04yx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Nov 2021 09:09:25 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id C439A10002A; Mon, 22 Nov 2021 09:09:23 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id B934D2194FD; Mon, 22 Nov 2021 09:09:23 +0100 (CET) Received: from lmecxl0573.lme.st.com (10.75.127.46) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Mon, 22 Nov 2021 09:09:23 +0100 Subject: Re: [PATCH 2/4] stm32mp15: remove configs dependency on CONFIG_TFABOOT To: Patrick Delaunay , CC: Alexandru Gagniuc , Marek Vasut , Heiko Schocher , Ilias Apalodimas , Jaehoon Chung , Jagan Teki , Jean-Philippe ROMAIN , Rick Chen , Simon Glass , References: <20211011075244.1.Icb805e47dd8102559236013264342b52c187813f@changeid> <20211011075244.2.Iceb3be142ba855190aaab771d6922f41ffcaccc3@changeid> From: Patrice CHOTARD Message-ID: Date: Mon, 22 Nov 2021 09:09:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211011075244.2.Iceb3be142ba855190aaab771d6922f41ffcaccc3@changeid> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.75.127.46] X-ClientProxiedBy: SFHDAG1NODE3.st.com (10.75.127.3) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-22_03,2021-11-22_01,2020-04-07_01 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 Patrick On 10/11/21 9:52 AM, Patrick Delaunay wrote: > Remove the dependency on CONFIG_TFABOOT in stm32mp Kconfig > - always activate the ARCH config: CONFIG_ARCH_SUPPORT_PSCI > and CONFIG_CPU_V7_HAS_NONSEC > - CONFIG_ARMV7_NONSEC is deactivated in trusted defconfig > - the correct sysreset driver is activated in each defconfig: > CONFIG_SYSRESET_PSCI or SYSRESET_SYSCON > > Reported-by: Alexandru Gagniuc > Signed-off-by: Patrick Delaunay > --- > > arch/arm/mach-stm32mp/Kconfig | 8 ++------ > configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig | 1 + > configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig | 1 + > .../stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig | 1 + > configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig | 1 + > configs/stm32mp15_basic_defconfig | 1 + > configs/stm32mp15_defconfig | 3 +++ > configs/stm32mp15_dhcom_basic_defconfig | 1 + > configs/stm32mp15_dhcor_basic_defconfig | 1 + > configs/stm32mp15_trusted_defconfig | 3 +++ > 10 files changed, 15 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig > index 69d56c23e1..4ef0daeab2 100644 > --- a/arch/arm/mach-stm32mp/Kconfig > +++ b/arch/arm/mach-stm32mp/Kconfig > @@ -35,10 +35,9 @@ config ENV_SIZE > > config STM32MP15x > bool "Support STMicroelectronics STM32MP15x Soc" > - select ARCH_SUPPORT_PSCI if !TFABOOT > - select ARM_SMCCC if TFABOOT > + select ARCH_SUPPORT_PSCI > select CPU_V7A > - select CPU_V7_HAS_NONSEC if !TFABOOT > + select CPU_V7_HAS_NONSEC > select CPU_V7_HAS_VIRT > select OF_BOARD_SETUP > select PINCTRL_STM32 > @@ -47,8 +46,6 @@ config STM32MP15x > select STM32_SERIAL > select SYS_ARCH_TIMER > imply CMD_NVEDIT_INFO > - imply SYSRESET_PSCI if TFABOOT > - imply SYSRESET_SYSCON if !TFABOOT > help > support of STMicroelectronics SOC STM32MP15x family > STM32MP157, STM32MP153 or STM32MP151 > @@ -153,7 +150,6 @@ config NR_DRAM_BANKS > > config DDR_CACHEABLE_SIZE > hex "Size of the DDR marked cacheable in pre-reloc stage" > - default 0x10000000 if TFABOOT > default 0x40000000 > help > Define the size of the DDR marked as cacheable in U-Boot > diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig > index 14bf6d1376..ecc5ec1ffe 100644 > --- a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig > +++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y > CONFIG_DM_RTC=y > CONFIG_RTC_STM32=y > CONFIG_SERIAL_RX_BUFFER=y > +CONFIG_SYSRESET_SYSCON=y > CONFIG_WDT=y > CONFIG_WDT_STM32MP=y > CONFIG_LZO=y > diff --git a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig > index 648ecbfc67..fc5b5f370b 100644 > --- a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig > +++ b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y > CONFIG_DM_RTC=y > CONFIG_RTC_STM32=y > CONFIG_SERIAL_RX_BUFFER=y > +CONFIG_SYSRESET_SYSCON=y > CONFIG_WDT=y > CONFIG_WDT_STM32MP=y > CONFIG_LZO=y > diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig > index f422ffbeda..4faa4e3ce4 100644 > --- a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig > +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y > CONFIG_DM_RTC=y > CONFIG_RTC_STM32=y > CONFIG_SERIAL_RX_BUFFER=y > +CONFIG_SYSRESET_SYSCON=y > CONFIG_WDT=y > CONFIG_WDT_STM32MP=y > CONFIG_LZO=y > diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig > index 244d9ccf4e..bab81bfa92 100644 > --- a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig > +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y > CONFIG_DM_RTC=y > CONFIG_RTC_STM32=y > CONFIG_SERIAL_RX_BUFFER=y > +CONFIG_SYSRESET_SYSCON=y > CONFIG_WDT=y > CONFIG_WDT_STM32MP=y > CONFIG_LZO=y > diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig > index 77ed82c99f..6b3c2d6150 100644 > --- a/configs/stm32mp15_basic_defconfig > +++ b/configs/stm32mp15_basic_defconfig > @@ -147,6 +147,7 @@ CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_STM32_QSPI=y > CONFIG_STM32_SPI=y > +CONFIG_SYSRESET_SYSCON=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_EHCI_HCD=y > diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig > index 701b1510c5..9d97301075 100644 > --- a/configs/stm32mp15_defconfig > +++ b/configs/stm32mp15_defconfig > @@ -8,10 +8,12 @@ CONFIG_ENV_OFFSET=0x480000 > CONFIG_ENV_SECT_SIZE=0x40000 > CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1" > CONFIG_TARGET_ST_STM32MP15x=y > +CONFIG_DDR_CACHEABLE_SIZE=0x10000000 > CONFIG_CMD_STM32KEY=y > CONFIG_CMD_STM32PROG=y > CONFIG_ENV_OFFSET_REDUND=0x4C0000 > CONFIG_TYPEC_STUSB160X=y > +# CONFIG_ARMV7_NONSEC is not set > CONFIG_DISTRO_DEFAULTS=y > CONFIG_SYS_LOAD_ADDR=0xc2000000 > CONFIG_FIT=y > @@ -126,6 +128,7 @@ CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_STM32_QSPI=y > CONFIG_STM32_SPI=y > +CONFIG_SYSRESET_PSCI=y > CONFIG_TEE=y > CONFIG_OPTEE=y > # CONFIG_OPTEE_TA_AVB is not set > diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig > index 5b85f6ad03..8da8f3fe2a 100644 > --- a/configs/stm32mp15_dhcom_basic_defconfig > +++ b/configs/stm32mp15_dhcom_basic_defconfig > @@ -129,6 +129,7 @@ CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_STM32_QSPI=y > CONFIG_STM32_SPI=y > +CONFIG_SYSRESET_SYSCON=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_EHCI_HCD=y > diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig > index 37dd2754c0..4315c4be3c 100644 > --- a/configs/stm32mp15_dhcor_basic_defconfig > +++ b/configs/stm32mp15_dhcor_basic_defconfig > @@ -123,6 +123,7 @@ CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_STM32_QSPI=y > CONFIG_STM32_SPI=y > +CONFIG_SYSRESET_SYSCON=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_EHCI_HCD=y > diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig > index b4ed090e3f..5e2ec49298 100644 > --- a/configs/stm32mp15_trusted_defconfig > +++ b/configs/stm32mp15_trusted_defconfig > @@ -9,10 +9,12 @@ CONFIG_ENV_SECT_SIZE=0x40000 > CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1" > CONFIG_STM32MP15x_STM32IMAGE=y > CONFIG_TARGET_ST_STM32MP15x=y > +CONFIG_DDR_CACHEABLE_SIZE=0x10000000 > CONFIG_CMD_STM32KEY=y > CONFIG_CMD_STM32PROG=y > CONFIG_ENV_OFFSET_REDUND=0x2C0000 > CONFIG_TYPEC_STUSB160X=y > +# CONFIG_ARMV7_NONSEC is not set > CONFIG_DISTRO_DEFAULTS=y > CONFIG_SYS_LOAD_ADDR=0xc2000000 > CONFIG_FIT=y > @@ -127,6 +129,7 @@ CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_STM32_QSPI=y > CONFIG_STM32_SPI=y > +CONFIG_SYSRESET_PSCI=y > CONFIG_TEE=y > CONFIG_OPTEE=y > # CONFIG_OPTEE_TA_AVB is not set > Reviewed-by: Patrice Chotard Thanks Patrice