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 6FE3BC433EF for ; Wed, 19 Jan 2022 14:04:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 20D4E83388; Wed, 19 Jan 2022 15:04:26 +0100 (CET) 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 Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="Zpy2/HAa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C2D418340A; Wed, 19 Jan 2022 15:04:24 +0100 (CET) Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) (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 C77A5830B3 for ; Wed, 19 Jan 2022 15:04:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf35.google.com with SMTP id g13so319477qvw.4 for ; Wed, 19 Jan 2022 06:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=dfj1ym1ftT+9fLA/wMTEnoKL5ANvklm9cEw8eqQ5TnI=; b=Zpy2/HAalFZiCacLzYhr8HApuGgCu/+GsUCfIwCmSAwf2R5QNbfPs3pziB8pS8qKD7 PSi13yTzDwyAMr2iBDQ3eNwRPyG+hA3Y3esjJ64BRvMgKZEEKPmI9j6qEzlYxeft/zvL LSlhT+Iu0k0HlOOJg8n60s+kBRrzGpP4ESJdI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dfj1ym1ftT+9fLA/wMTEnoKL5ANvklm9cEw8eqQ5TnI=; b=PKW9Zcnq6T689heJOjOCyCLocUxdYVG0Uu1GnzvgXkRlPLbfJQzdUCDfyvdbv0aCv+ ULmbVA3YIq29dx5OFRpG16nMV4SpfJV3M1O7/tX0PG4S8EvkGXf6ov5JhwnLIZw1SVEp GwW6GOntQ4pB0ns8bPgiE2m6wX+s+OEmhMz4UjOz1rE5wJClAvMgcvre1waHd38Uw3yj uSnj/St+AqPmmokMKel4Ud8F03LNow5Rv/KwLZWWBRUqjeTY49xQ4W9VSJ7Gr7LlDn3u /yu/wIZA5+s78anRDG+rz620NLhHqGhTDjrdy+bAPVTqnMP3YQLPo6Bi6OGiQDZrzTSr A3bw== X-Gm-Message-State: AOAM530CW7JAms8KjfPRjvccCc45Walwut7hJwoBEnD4SPQerex7uTAU 4k8EXkJRsE1AMp+m7zCDvPIDfA== X-Google-Smtp-Source: ABdhPJx+T2XYmsORGheQuwA/uzjKlzG+QlYmE5ODBoc+CGn4iYZwwmUGx6x3uliCLbu4mU74Hbsb8g== X-Received: by 2002:a05:6214:411c:: with SMTP id kc28mr27189018qvb.35.1642601060343; Wed, 19 Jan 2022 06:04:20 -0800 (PST) Received: from bill-the-cat (2603-6081-7b01-cbda-ec5d-c40e-552f-ed0c.res6.spectrum.com. [2603:6081:7b01:cbda:ec5d:c40e:552f:ed0c]) by smtp.gmail.com with ESMTPSA id y12sm12274272qko.36.2022.01.19.06.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 06:04:19 -0800 (PST) Date: Wed, 19 Jan 2022 09:04:17 -0500 From: Tom Rini To: Simon Glass Cc: U-Boot Mailing List , Ilias Apalodimas , Daniel Schwierzeck , Dennis Gilmore , Steffen Jaeckel , Lukas Auer , Michal Simek , Heinrich Schuchardt Subject: Re: [PATCH v3 31/31] RFC: Switch rpi over to use bootstd Message-ID: <20220119140417.GQ2631111@bill-the-cat> References: <20220119014315.1938157-1-sjg@chromium.org> <20220119014315.1938157-21-sjg@chromium.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="m7GK0ytKUM7VScCy" Content-Disposition: inline In-Reply-To: <20220119014315.1938157-21-sjg@chromium.org> X-Clacks-Overhead: GNU Terry Pratchett 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.2 at phobos.denx.de X-Virus-Status: Clean --m7GK0ytKUM7VScCy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 18, 2022 at 06:43:15PM -0700, Simon Glass wrote: > Switch this over, for testing purposes. >=20 > Signed-off-by: Simon Glass > --- >=20 > (no changes since v1) >=20 > boot/Kconfig | 3 ++- > include/configs/rpi.h | 39 ++------------------------------------- > 2 files changed, 4 insertions(+), 38 deletions(-) >=20 > diff --git a/boot/Kconfig b/boot/Kconfig > index 9cf1d013f20..eab3c0f3467 100644 > --- a/boot/Kconfig > +++ b/boot/Kconfig > @@ -1124,7 +1124,8 @@ config USE_BOOTCOMMAND > config BOOTCOMMAND > string "bootcmd value" > depends on USE_BOOTCOMMAND && !USE_DEFAULT_ENV_FILE > - default "run distro_bootcmd" if DISTRO_DEFAULTS > + default "bootflow scan -lb" if BOOTSTD > + default "run distro_bootcmd" if !BOOTSTD && DISTRO_DEFAULTS > help > This is the string of commands that will be used as bootcmd and if > AUTOBOOT is set, automatically run. > diff --git a/include/configs/rpi.h b/include/configs/rpi.h > index d5e064fb379..ea373d0c221 100644 > --- a/include/configs/rpi.h > +++ b/include/configs/rpi.h > @@ -133,47 +133,12 @@ > "fdt_addr_r=3D0x02600000\0" \ > "ramdisk_addr_r=3D0x02700000\0" > =20 > -#if CONFIG_IS_ENABLED(CMD_MMC) > - #define BOOT_TARGET_MMC(func) \ > - func(MMC, mmc, 0) \ > - func(MMC, mmc, 1) \ > - func(MMC, mmc, 2) > -#else > - #define BOOT_TARGET_MMC(func) > -#endif > - > -#if CONFIG_IS_ENABLED(CMD_USB) > - #define BOOT_TARGET_USB(func) func(USB, usb, 0) > -#else > - #define BOOT_TARGET_USB(func) > -#endif > - > -#if CONFIG_IS_ENABLED(CMD_PXE) > - #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) > -#else > - #define BOOT_TARGET_PXE(func) > -#endif > - > -#if CONFIG_IS_ENABLED(CMD_DHCP) > - #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) > -#else > - #define BOOT_TARGET_DHCP(func) > -#endif > - > -#define BOOT_TARGET_DEVICES(func) \ > - BOOT_TARGET_MMC(func) \ > - BOOT_TARGET_USB(func) \ > - BOOT_TARGET_PXE(func) \ > - BOOT_TARGET_DHCP(func) > - > -#include > - > #define CONFIG_EXTRA_ENV_SETTINGS \ > "dhcpuboot=3Dusb start; dhcp u-boot.uimg; bootm\0" \ > + "boot_targets=3Dmmc0 mmc1 usb0 pxe dhcp\0" \ We have the indirect defines to func(...) everywhere so that if a feature is disabled we still build + function, as otherwise it's a loud link error. I assume with this we just get a try and fail move to the next target at run time, yes? --=20 Tom --m7GK0ytKUM7VScCy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmHoGloACgkQFHw5/5Y0 tyy+cwv/fuXn6+lgTlQtPdAa734dYl5EmgH/nswAghC+8MqSfXw++bPQbsraGPND kn7oscZhRPLVCG4E/TFrxvGrQnM54BtvYRYy+bPueRO7YqqToY3mGQlyJt0id++w 0kNBFua4hp30O3aztJxkLw4xpCIBvr+ohW1kUHIGVDT8r4tvmeJgSaqw0mLVZFZL wSyG9TlQEhUWgOayNDzxdWdpG63SldlnIc9uySmv7OD1I7aSz4dDhO8sIrAZ6GsX 9fkMc/FxEv7kSoNF1e0CNxvjlEvRTWmxJWH6J0cN/AQoaW0xtzUA4ab4BcqxQRCT yaJGtnFNHua/WnxbIcZxTecWknhPeDI0ZiLe/5cCLrdvgEfj/hd+kKg0kfymtoGb r3nP+d6PYIdkWLJFVAkVjuVx1pgYt8W6eARDM7DHjZqOFx7BNU4eDaLhjvZglRN8 p/d1Ucv/68zhlMNRsratyoIjTEfJsdHjRfLC3EmasXZ3GTcPGaWMnTizsfKVuJnJ PHYzn0dM =TXt2 -----END PGP SIGNATURE----- --m7GK0ytKUM7VScCy--