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 2AC2EC6FD1D for ; Thu, 30 Mar 2023 11:01:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F59F85E0E; Thu, 30 Mar 2023 13:01:07 +0200 (CEST) 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="PUouvEuj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E06E85E3F; Thu, 30 Mar 2023 13:01:04 +0200 (CEST) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) (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 2239385CF6 for ; Thu, 30 Mar 2023 13:01:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=devarsht@ti.com Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32UB0v3k085397; Thu, 30 Mar 2023 06:00:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680174057; bh=O9sBgzlsAzCcMBISLxJerMpF//3k0jk/9iowYEh7WZE=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=PUouvEuj4j8CFdI/JmkihiQCZuABsFelEJI2k/7YtYFpHfBcpJjlTEELsvmJxhTnH zQBDwuSLE6iKACuC1Ywsc+VIOBNOrNQ4Y6xtUoI05IA3NAdkxYmLSzGF7M8qcdxqmO H0h0xoChmupS+YCwY4lOcmHrt72pHcuBtzxJ6omY= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32UB0v7p048008 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Mar 2023 06:00:57 -0500 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 30 Mar 2023 06:00:57 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 30 Mar 2023 06:00:57 -0500 Received: from [172.24.145.199] (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32UB0sLw041592; Thu, 30 Mar 2023 06:00:55 -0500 Message-ID: <26953f6c-adbb-823f-aeb7-4cec8a31d09f@ti.com> Date: Thu, 30 Mar 2023 16:30:54 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH V2] include: configs: am64x_evm: Change to using .env Content-Language: en-US To: Nikhil M Jain , CC: , , References: <20230330085409.96100-1-n-jain1@ti.com> From: Devarsh Thakkar In-Reply-To: <20230330085409.96100-1-n-jain1@ti.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 Hi Nikhil Thanks for the patch, On 30/03/23 14:24, Nikhil M Jain wrote: > Move to using .env file for setting up environment variables for am64x. > > Signed-off-by: Nikhil M Jain > --- > V2: > - Corrected commit message. > > board/ti/am64x/am64x.env | 63 +++++++++++++++++++++++++++ > include/configs/am64x_evm.h | 85 ------------------------------------- > 2 files changed, 63 insertions(+), 85 deletions(-) > create mode 100644 board/ti/am64x/am64x.env > > diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env > new file mode 100644 > index 0000000000..c3960be38e > --- /dev/null > +++ b/board/ti/am64x/am64x.env > @@ -0,0 +1,63 @@ > +#include > +#include > +#include > + > +findfdt= > + if test $board_name = am64x_gpevm; then > + setenv name_fdt k3-am642-evm.dtb; fi; > + if test $board_name = am64x_skevm; then > + setenv name_fdt k3-am642-sk.dtb; fi; > + if test $name_fdt = undefined; then > + echo WARNING: Could not determine device tree to use; fi; > +name_kern=Image > +console=ttyS2,115200n8 > +args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts} > +run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr} > + > +boot=mmc > +mmcdev=1 > +bootpart=1:2 > +bootdir=/boot > +rd_spec=- > +init_mmc=run args_all args_mmc > +get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt} > +get_overlay_mmc= > + fdt address ${fdtaddr}; > + fdt resize 0x100000; > + for overlay in $name_overlays; > + do; > + load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && > + fdt apply ${dtboaddr}; > + done; > +get_kern_mmc=load mmc ${bootpart} ${loadaddr} > + ${bootdir}/${name_kern} > +get_fit_mmc=load mmc ${bootpart} ${addr_fit} > + ${bootdir}/${name_fit} > +partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs} > + > +args_usb=run finduuid;setenv bootargs console=${console} > + ${optargs} > + root=PARTUUID=${uuid} rw > + rootfstype=${mmcrootfstype} > +init_usb=run args_all args_usb > +get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt} > +get_overlay_usb= > + fdt address ${fdtaddr}; > + fdt resize 0x100000; > + for overlay in $name_overlays; > + do; > + load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && fdt apply > + ${dtboaddr}; > + done; > +get_kern_usb=load usb ${bootpart} ${loadaddr} > + ${bootdir}/${name_kern} > +get_fit_usb=load usb ${bootpart} ${addr_fit} > + ${bootdir}/${name_fit} > +usbboot=setenv boot usb; > + setenv bootpart 0:2; > + usb start; > + run findfdt; > + run init_usb; > + run get_kern_usb; > + run get_fdt_usb; > + run run_kern; > diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h > index 26a7f2521e..1e37ab47b9 100644 > --- a/include/configs/am64x_evm.h > +++ b/include/configs/am64x_evm.h > @@ -18,91 +18,6 @@ > /* DDR Configuration */ > #define CFG_SYS_SDRAM_BASE1 0x880000000 > > -#define PARTS_DEFAULT \ > - /* Linux partitions */ \ > - "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0" > - > -/* U-Boot general configuration */ > -#define EXTRA_ENV_AM642_BOARD_SETTINGS \ > - "findfdt=" \ > - "if test $board_name = am64x_gpevm; then " \ > - "setenv fdtfile k3-am642-evm.dtb; fi; " \ > - "if test $board_name = am64x_skevm; then " \ > - "setenv fdtfile k3-am642-sk.dtb; fi;" \ > - "if test $fdtfile = undefined; then " \ > - "echo WARNING: Could not determine device tree to use; fi; \0" \ > - "name_kern=Image\0" \ > - "console=ttyS2,115200n8\0" \ > - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ > - "${mtdparts}\0" \ > - "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" > - > -/* U-Boot MMC-specific configuration */ > -#define EXTRA_ENV_AM642_BOARD_SETTINGS_MMC \ > - "boot=mmc\0" \ > - "mmcdev=1\0" \ > - "bootpart=1:2\0" \ > - "bootdir=/boot\0" \ > - "rd_spec=-\0" \ > - "init_mmc=run args_all args_mmc\0" \ > - "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ > - "get_overlay_mmc=" \ > - "fdt address ${fdtaddr};" \ > - "fdt resize 0x100000;" \ > - "for overlay in $name_overlays;" \ > - "do;" \ > - "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \ > - "fdt apply ${dtboaddr};" \ > - "done;\0" \ > - "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ > - "${bootdir}/${name_kern}\0" \ > - "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \ > - "${bootdir}/${name_fit}\0" \ > - "partitions=" PARTS_DEFAULT > - > -#define EXTRA_ENV_AM642_BOARD_SETTING_USBMSC \ > - "args_usb=run finduuid;setenv bootargs console=${console} " \ > - "${optargs} " \ > - "root=PARTUUID=${uuid} rw " \ > - "rootfstype=${mmcrootfstype}\0" \ > - "init_usb=run args_all args_usb\0" \ > - "get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ > - "get_overlay_usb=" \ > - "fdt address ${fdtaddr};" \ > - "fdt resize 0x100000;" \ > - "for overlay in $name_overlays;" \ > - "do;" \ > - "load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \ > - "fdt apply ${dtboaddr};" \ > - "done;\0" \ > - "get_kern_usb=load usb ${bootpart} ${loadaddr} " \ > - "${bootdir}/${name_kern}\0" \ > - "get_fit_usb=load usb ${bootpart} ${addr_fit} " \ > - "${bootdir}/${name_fit}\0" \ > - "usbboot=setenv boot usb;" \ > - "setenv bootpart 0:2;" \ > - "usb start;" \ > - "run findfdt;" \ > - "run init_usb;" \ > - "run get_kern_usb;" \ > - "run get_fdt_usb;" \ > - "run run_kern\0" > - > -#define EXTRA_ENV_DFUARGS \ > - DFU_ALT_INFO_MMC \ > - DFU_ALT_INFO_EMMC \ > - DFU_ALT_INFO_RAM \ > - DFU_ALT_INFO_OSPI > - > -/* Incorporate settings into the U-Boot environment */ > -#define CFG_EXTRA_ENV_SETTINGS \ > - DEFAULT_LINUX_BOOT_ENV \ > - DEFAULT_MMC_TI_ARGS \ > - EXTRA_ENV_AM642_BOARD_SETTINGS \ > - EXTRA_ENV_AM642_BOARD_SETTINGS_MMC \ > - EXTRA_ENV_DFUARGS Don't we need dfu env args migrated to env.txt too ? Regards Devarsh \ > - EXTRA_ENV_AM642_BOARD_SETTING_USBMSC > - > /* Now for the remaining common defines */ > #include >