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=-19.5 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,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 89EDCC4338F for ; Thu, 19 Aug 2021 03:51:55 +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 0EA39610CB for ; Thu, 19 Aug 2021 03:51:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0EA39610CB 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 9C46883277; Thu, 19 Aug 2021 05:48:11 +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="E/kaZk7s"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BEAC083205; Thu, 19 Aug 2021 05:46:58 +0200 (CEST) Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) (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 1BAA0831D6 for ; Thu, 19 Aug 2021 05:46:45 +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-x32d.google.com with SMTP id 108-20020a9d01750000b029050e5cc11ae3so7001003otu.5 for ; Wed, 18 Aug 2021 20:46:44 -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=bY39CvwlBj8P64Tjg+MMGaH+c1dXgfLMK939FkY05D4=; b=E/kaZk7soUhcxVnC74sLMLtFDqdF1Ryhs0xp3R30b/o6Wa/QxjQyy6O0JBUqygOQP3 lC7HQt1dlj3qbRadi5MsKBasJVjcuJbroSrigXrXPaLENdwSqtjl7ep0s3xpkTK9RtjT Vel0lSKFncQGcTzdUgL4T9kkfBnmp3TDJGLCA= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=bY39CvwlBj8P64Tjg+MMGaH+c1dXgfLMK939FkY05D4=; b=aJ4wmCieFu4NfuEIPhCpjxNKNPpcEkgBLpzd8P54Eki04No2hIvzqprJjFg5SzV3BP iYv1xvB9JE5HUWPitsBMbb/KkNAivtd1bLGbRwNwRRvsRiirfDm1vd4NnIf5u60Fk9Ui N0Uh59aL56ChJuVBFqrevWkyeUEjKei0U4hcZyZMx9MItetVyxmb1nh49WwSTtUYNGB8 xWEkaKjfZKhSCA4r+f8U5oHgxjuOf5jcm2ErvyzBBR5przMCaO5nX9hEg/+TrDyHi48S fLYeud54cG1eG0IoZOse5xRZ0WDDoyqKH5SiiB3r4+xrF5CsNWzOc/4OGyKOb+mWAXZd oXwA== X-Gm-Message-State: AOAM531VGZ5nYsA2BAwKx57GFsHroq8Q0NSgHuefsUrphFRmoGdjvtq9 1UUogzSSbDVhnsa+tqawX5CSDLvBOsk/3w== X-Google-Smtp-Source: ABdhPJzrjfqyTHhTqd9ObM+/Mz/pjbjH8mfuJ6Yho2R72sIGNeOOAZpOlCSUuwXO/LDjTa3bD2ZYIw== X-Received: by 2002:a05:6830:3103:: with SMTP id b3mr10094492ots.208.1629344803570; Wed, 18 Aug 2021 20:46:43 -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 q3sm370025ooa.13.2021.08.18.20.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 20:46:43 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Steffen Jaeckel , Michal Simek , Tom Rini , Dennis Gilmore , Daniel Schwierzeck , Lukas Auer , Simon Glass , Matthias Brugger , Stephen Warren , Stephen Warren Subject: [PATCH 28/28] RFC: rpi: Switch over to use bootflow Date: Wed, 18 Aug 2021 21:46:01 -0600 Message-Id: <20210818214547.28.I9aba359270c4dcb3b379d7c2efecc7e3a3268d5d@changeid> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog In-Reply-To: <20210819034601.1618773-1-sjg@chromium.org> References: <20210819034601.1618773-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 Drop the distro boot scripts and use bootflow instead. Note: This is just a demonstration. It does not support EFI at present. Signed-off-by: Simon Glass --- boot/Kconfig | 2 +- doc/develop/distro.rst | 3 +++ include/configs/rpi.h | 37 +------------------------------------ 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 8565fbeab84..a1beb182f60 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1011,7 +1011,7 @@ 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 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/doc/develop/distro.rst b/doc/develop/distro.rst index 105dcf28190..8b26bc1f73b 100644 --- a/doc/develop/distro.rst +++ b/doc/develop/distro.rst @@ -157,6 +157,9 @@ a line with "CONFIG_DISTRO_DEFAULTS=y". If you want to enable this from Kconfig itself, for e.g. all boards using a specific SoC then add a "imply DISTRO_DEFAULTS" to your SoC CONFIG option. + +TO BE UPDATED: + In your board configuration file, include the following:: #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 522b41c02db..d2bac1e1df2 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -161,46 +161,11 @@ "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 - #define CONFIG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ ENV_DFU_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ - BOOTENV + ENV_MEM_LAYOUT_SETTINGS #endif -- 2.33.0.rc1.237.g0d66db33f3-goog