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 X-Spam-Level: X-Spam-Status: No, score=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DC0FC07E95 for ; Tue, 13 Jul 2021 09:03:27 +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 0220C61260 for ; Tue, 13 Jul 2021 09:03:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0220C61260 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=ti.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 799278310D; Tue, 13 Jul 2021 11:03:25 +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="nam7qVqZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EA24683123; Tue, 13 Jul 2021 11:03:23 +0200 (CEST) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) (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 9996D82903 for ; Tue, 13 Jul 2021 11:03:20 +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=lokeshvutla@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 16D93Hdq024542; Tue, 13 Jul 2021 04:03:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1626166997; bh=X4mZiunhbR1EjXhzgF4Y36oCGOw5wD8pTL2H0X/lMvo=; h=Subject:To:References:From:Date:In-Reply-To; b=nam7qVqZzwVUL+w/XETfFg1yk2L5+xohmWXBauvDt2hWz398drQ9UIW3DqkGUXyuz W7Qrxt961YPilI7AEFYAr+0nKXEOYdIWJFaxrnJibGpDQdBuS/W7POJ0IeivxDk9Vz 1y1Oq9xsLR4fuYgg3gwZJyqTH0yRfpGIOGE2Xq2s= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 16D93HiQ026139 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 13 Jul 2021 04:03:17 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Tue, 13 Jul 2021 04:03:17 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2 via Frontend Transport; Tue, 13 Jul 2021 04:03:17 -0500 Received: from [10.24.69.20] (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 16D93FiC092688; Tue, 13 Jul 2021 04:03:16 -0500 Subject: Re: [PATCH] configs: am65x_evm: Switch envboot out for distro_bootcmd To: Tom Rini , References: <20210701200458.10697-1-trini@konsulko.com> From: Lokesh Vutla Message-ID: Date: Tue, 13 Jul 2021 14:33:15 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210701200458.10697-1-trini@konsulko.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US 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.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 On 02/07/21 1:34 am, Tom Rini wrote: > Swap out the TI-centric "envboot" logic for the generic distro_bootcmd > logic for the bootcmd we run before trying to do something more complex > involving additional firmware, etc. > > Cc: Lokesh Vutla > Signed-off-by: Tom Rini This is causing build errors for am6 platforms. https://source.denx.de/u-boot/custodians/u-boot-ti/-/jobs/291139 Thanks and regards, Lokesh > --- > configs/am65x_evm_a53_defconfig | 2 +- > include/configs/am65x_evm.h | 10 ++++++++-- > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig > index 6f9309e17147..eefcdfa36571 100644 > --- a/configs/am65x_evm_a53_defconfig > +++ b/configs/am65x_evm_a53_defconfig > @@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y > CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000 > # CONFIG_USE_SPL_FIT_GENERATOR is not set > CONFIG_OF_BOARD_SETUP=y > -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern" > +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern" > CONFIG_LOGLEVEL=7 > CONFIG_CONSOLE_MUX=y > CONFIG_SPL_SYS_MALLOC_SIMPLE=y > diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h > index 8c50fe9d11ff..749689ca3610 100644 > --- a/include/configs/am65x_evm.h > +++ b/include/configs/am65x_evm.h > @@ -10,7 +10,6 @@ > #define __CONFIG_AM654_EVM_H > > #include > -#include > #include > #include > #include > @@ -126,6 +125,12 @@ > DFU_ALT_INFO_EMMC \ > DFU_ALT_INFO_OSPI > > +#define BOOT_TARGET_DEVICES(func) \ > + func(MMC, mmc, 1) \ > + func(MMC, mmc, 0) > + > +#include > + > /* Incorporate settings into the U-Boot environment */ > #define CONFIG_EXTRA_ENV_SETTINGS \ > DEFAULT_LINUX_BOOT_ENV \ > @@ -136,7 +141,8 @@ > EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD \ > EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI \ > EXTRA_ENV_RPROC_SETTINGS \ > - EXTRA_ENV_DFUARGS > + EXTRA_ENV_DFUARGS \ > + BOOTENV > > #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 > >