From patchwork Thu Jul 1 20:04:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1499707 X-Patchwork-Delegate: lokeshvutla@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GG8Md5x1Lz9sVb for ; Fri, 2 Jul 2021 06:05:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 39F4282C1C; Thu, 1 Jul 2021 22:05:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 221B682C1D; Thu, 1 Jul 2021 22:05:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7D3F382B82 for ; Thu, 1 Jul 2021 22:05:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f175.google.com with SMTP id j13so7239325qka.8 for ; Thu, 01 Jul 2021 13:05:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iDDTB47irZcc1xLJ3mV70eva09juv2BboNIb2qMbdkI=; b=GH/O4tsqOqM9C4jD7xShM3994u1leAjUfVCev+5v0ByxmoKKjTzutzIntfoG56tewB vdow41+3XrnbAmBRuW1rNOUJOtnwNmZnt3PPNbA/pV6jNHPHoTr+fOfpE3bdLad2Cx2F GawxnIm1Jso1kApMqqYkL3LR6tmIaLeDw6JOrYllIlSUeiv8i+Lg3MA8T9mp74SJ8Ppv 1GbTczmKQa2aR+0D9dPFQR2aXXRaAK1geLLEo1wacPLAyFO/qKdgqWNHtci2O44M9KTx QYbTtAcmBahDTD+qaWks2arXeUcDUICzjbsexB5pYFM0chV7p9guFamdyb0jyOslkWns ZIMg== X-Gm-Message-State: AOAM5335HThPJlCaSCyWqUBiVTYVACFAraSnhfxgvuuonwVi4EafwFSz 8eIJ+2qeX3BF1raZpeSIzul5bPYlBtgD X-Google-Smtp-Source: ABdhPJyQBrh0J+RYXoWVp82kYufUMXlpJryXEMCjhQYcomW943Q9ZnWqgQQtBMsM2/nOcB7Ne+7oNw== X-Received: by 2002:a37:7841:: with SMTP id t62mr1786334qkc.412.1625169902886; Thu, 01 Jul 2021 13:05:02 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-91af-d604-26f4-428b.res6.spectrum.com. [2603:6081:7b01:cbda:91af:d604:26f4:428b]) by smtp.gmail.com with ESMTPSA id a190sm95240qkf.9.2021.07.01.13.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 13:05:01 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Lokesh Vutla Subject: [PATCH] configs: am65x_evm: Switch envboot out for distro_bootcmd Date: Thu, 1 Jul 2021 16:04:58 -0400 Message-Id: <20210701200458.10697-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 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 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 --- 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