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 1BC92C4707C for ; Fri, 12 Jan 2024 21:27:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 978D78799C; Fri, 12 Jan 2024 22:26:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.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=ti.com header.i=@ti.com header.b="lTM9pG+4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6269287831; Fri, 12 Jan 2024 22:14:23 +0100 (CET) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) (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 E375E807A7 for ; Fri, 12 Jan 2024 22:14:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=j-humphreys@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 40CLEEA7039432; Fri, 12 Jan 2024 15:14:14 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1705094054; bh=ZmIU4HenQQsDvNEYi9i49MgQsk7SF4ansVRtQySNPU4=; h=From:To:CC:Subject:In-Reply-To:References:Date; b=lTM9pG+4AIXIKBUXTxe4Jr5PyQjZVNZsiwSZGl8XGfFDI3juTQiL47gQzu/atDiAM pJJbcSIQmJ6behFEUuDQXSw5mnG7OCzZpzPNiAN1dWScDOLp5ZYmD3RUzX6VeN7bgg AIsLNSRs608hpcZir2EXNKLRfLE8ttkW48OEEMbI= Received: from DFLE107.ent.ti.com (dfle107.ent.ti.com [10.64.6.28]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 40CLEEGI082048 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 12 Jan 2024 15:14:14 -0600 Received: from DFLE107.ent.ti.com (10.64.6.28) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 12 Jan 2024 15:14:13 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 12 Jan 2024 15:14:13 -0600 Received: from localhost (udb0321960.dhcp.ti.com [128.247.81.241]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 40CLEDS6060372; Fri, 12 Jan 2024 15:14:13 -0600 From: Jon Humphreys To: Nishanth Menon , Tom Rini CC: Kamlesh Gurudasani , Sinthu Raja , Neha Malcom Francis , Heinrich Schuchardt , Roger Quadros , Simon Glass , Andrew Davis , Mattijs Korpershoek , Nikhil M Jain , "Manorit Chawdhry" , Bryan Brattlof , Robert Nelson , , Nishanth Menon Subject: Re: [PATCH V2 04/10] board: ti: am64x: Set fdtfile from C code instead of findfdt script In-Reply-To: <20240109191506.3820908-5-nm@ti.com> References: <20240109191506.3820908-1-nm@ti.com> <20240109191506.3820908-5-nm@ti.com> Date: Fri, 12 Jan 2024 15:14:13 -0600 Message-ID: <861qamdzkq.fsf@udb0321960.dhcp.ti.com> MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Mailman-Approved-At: Fri, 12 Jan 2024 22:26:42 +0100 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.8 at phobos.denx.de X-Virus-Status: Clean Nishanth Menon writes: > We now can provide a map and have the standard fdtfile variable set from > code itself. This allows for bootstd to "just work". > > While at this, replace findfdt in environment with a warning as it is no > longer needed. > > Signed-off-by: Nishanth Menon > --- > Changes from V1: None. > I have retained the the existing names used in the file as is for now, a > cleanup as suggested in review is probably something to do in a follow > on series. > > V1: https://lore.kernel.org/r/20240108173301.2692332-5-nm@ti.com > > board/ti/am64x/am64x.env | 9 --------- > board/ti/am64x/evm.c | 8 ++++++++ > 2 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env > index efd736b99be4..9a8812d4ee54 100644 > --- a/board/ti/am64x/am64x.env > +++ b/board/ti/am64x/am64x.env > @@ -2,14 +2,6 @@ > #include > #include > > -findfdt= > - if test $board_name = am64x_gpevm; then > - setenv name_fdt ti/k3-am642-evm.dtb; fi; > - if test $board_name = am64x_skevm; then > - setenv name_fdt ti/k3-am642-sk.dtb; fi; > - if test $name_fdt = undefined; then > - echo WARNING: Could not determine device tree to use; fi; > - setenv fdtfile ${name_fdt} > name_kern=Image > console=ttyS2,115200n8 > args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts} > @@ -43,7 +35,6 @@ get_fit_usb=load usb ${bootpart} ${addr_fit} > usbboot=setenv boot usb; > setenv bootpart 0:2; > usb start; > - run findfdt; > run init_usb; > run get_kern_usb; > run get_fdt_usb; > diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c > index a6dcff2eb434..e2f506d2c6ea 100644 > --- a/board/ti/am64x/evm.c > +++ b/board/ti/am64x/evm.c > @@ -16,6 +16,7 @@ > #include > > #include "../common/board_detect.h" > +#include "../common/fdt_ops.h" > > #define board_is_am64x_gpevm() (board_ti_k3_is("AM64-GPEVM") || \ > board_ti_k3_is("AM64-HSEVM")) > @@ -180,6 +181,12 @@ int checkboard(void) > } > > #ifdef CONFIG_BOARD_LATE_INIT > +static struct ti_fdt_map ti_am64_evm_fdt_map[] = { > + {"am64x_gpevm", "k3-am642-evm.dtb"}, > + {"am64x_skevm", "k3-am642-sk.dtb"}, > + { /* Sentinel. */ } > +}; > + > static void setup_board_eeprom_env(void) > { > char *name = "am64x_gpevm"; > @@ -197,6 +204,7 @@ static void setup_board_eeprom_env(void) > > invalid_eeprom: > set_board_info_env_am6(name); > + ti_set_fdt_env(name, ti_am64_evm_fdt_map); > } > > static void setup_serial(void) > -- > 2.43.0 Reviewed-by: Jonathan Humphreys