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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B5BDC433F5 for ; Sat, 23 Oct 2021 23:33: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 ECF716023E for ; Sat, 23 Oct 2021 23:33:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ECF716023E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 88CF4835E3; Sun, 24 Oct 2021 01:31:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="c0s+2bfl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED1EC834A9; Sun, 24 Oct 2021 01:28:28 +0200 (CEST) Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) (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 F1C1483536 for ; Sun, 24 Oct 2021 01:27:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x332.google.com with SMTP id x27-20020a9d459b000000b0055303520cc4so9261846ote.13 for ; Sat, 23 Oct 2021 16:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4Ta5o+bGAAeRB3FVuf3F97BrqoKIDl5qliyJtIj2GO0=; b=c0s+2bflNyHX4PKGh+/BQx67m2DhRKTdYXtzfstkul+gGDATt0bvwR13ycMLAmO7hl ZVfwoBwt8ruvbZ1IKZSb0xiGNcQSe54k5uvnkSEaqEZlOxKCU1BXUNUIN6VrmMzWVKCb 2CiHAYt7A+vyl+s4voELy713BnrkpbqYSdzY0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4Ta5o+bGAAeRB3FVuf3F97BrqoKIDl5qliyJtIj2GO0=; b=A0fpOTRtGJioz/7k9V8eE9kk3lArf1sEZcryQ8JRJ2jH5cIpLk3lK+xgGCgaC/7KOc jrHTtj/SnqE12rDD8uY7wpXgpMZ3P4gcNB/sSptjcJDpw95L81KtW5G4AMce+SNiCqdD 3R8RKrPL8dtjNshK8MkGmK29kPMHFEmLSWpmgRBdhAMQbebj53E3PuiKPi6S1iCZzpnB LQsouM976yyeFYhDyTU9Mj6zjyXhRCUF/i8h5wm031CgFFSebiXrgY42VfSHAw1G+zOg fbm+8xxRZmxLSuyk1CnGQQ5NruLnacxZVyYz+3+1zD1bAQqFmLKiG863j1vVhabY3pIl pTLA== X-Gm-Message-State: AOAM530jDFzEinvrgzQAzXgG/bVK5KemY2TGSdV1TwSoYTihBH7TsXhq Denf3N7GRBo5BOmWEzTFHfSQWMtkHT+9WQ== X-Google-Smtp-Source: ABdhPJzThLN45gKAXAcnJ6K/448trONe2EXI/PeVtuIzKULPW88isuo+56Q6XDw4cA1aU8oQya44Xg== X-Received: by 2002:a05:6830:2f3:: with SMTP id r19mr6938140ote.226.1635031650521; Sat, 23 Oct 2021 16:27:30 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id l24sm2253885oop.4.2021.10.23.16.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Oct 2021 16:27:30 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Michal Simek , Heinrich Schuchardt , Tom Rini , Ilias Apalodimas , Daniel Schwierzeck , Steffen Jaeckel , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Lukas Auer , Dennis Gilmore , Simon Glass Subject: [PATCH v2 41/41] RFC: Switch rpi over to use bootstd Date: Sat, 23 Oct 2021 17:26:35 -0600 Message-Id: <20211023232635.9195-29-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211023232635.9195-1-sjg@chromium.org> References: <20211023232635.9195-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Switch this over, for testing purposes. Signed-off-by: Simon Glass --- (no changes since v1) boot/Kconfig | 3 ++- include/configs/rpi.h | 41 ++++------------------------------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 2862bd10710..ce4686d8d15 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1061,7 +1061,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 55768a46da2..0c236579b55 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -132,48 +132,15 @@ "scriptaddr=0x02400000\0" \ "pxefile_addr_r=0x02500000\0" \ "fdt_addr_r=0x02600000\0" \ - "ramdisk_addr_r=0x02700000\0" - -#if CONFIG_IS_ENABLED(CMD_MMC) - #define BOOT_TARGET_MMC(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) -#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 + "ramdisk_addr_r=0x02700000\0" \ + "ethaddr=b8:27:eb:a6:61:e1\0" #define CONFIG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ + "boot_targets=mmc0 mmc1 usb0 pxe dhcp\0" \ ENV_DEVICE_SETTINGS \ ENV_DFU_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ - BOOTENV + ENV_MEM_LAYOUT_SETTINGS #endif -- 2.33.0.1079.g6e70778dc9-goog