From patchwork Mon Sep 27 06:47:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 514661 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp3840051jao; Sun, 26 Sep 2021 23:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxa6nftxpol8ts3Kj8uw094RGu04VpifUb2ERGeDsc3aOzlh2QV42mgUocX4O8oM2dy34G X-Received: by 2002:a17:906:b80b:: with SMTP id dv11mr26617962ejb.156.1632725322599; Sun, 26 Sep 2021 23:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632725322; cv=none; d=google.com; s=arc-20160816; b=KIPPxkbWIIQ4/CwJJ/tzJ0uTV43jbM+h4oDKUruFywM1phdTEXxcr1R/YTbj+u32+H sOqLm4lmID1bz6F+oFeabJAMbsJz2qSjzCqIahMWZcUkxFIIvV9l1/kdJEJGdmg81mRi YGWjpcxrqQ7ZSMxSUn5UMsfQAICuG8kstv74BM97rK27+bIixSxRO+PFD/oB62FhDkok rKwyVAvn3lNlnJ64UXZuZpBbuxUQOaBfmP6MylBssb8y350sW3ovBng2jYyXdd63wmbm crDgUEST6TrFi8d4fmb97mt1F62lAevqZZhOG7OeEq6GKpe23kA2RlA3FuBuestg3vq5 ybyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Z/+PShzHeuWeSQbVu69qWjybFwLZgWZYSy7GBE68WGo=; b=uFDmWSYA5v3UdLDXUSEHLHF8YkLeiN/HtOwKRoyf7eLQSHnjEQVussWn5r8pIpgaKG R/Q6gaZlJQMg0w0yq7zrZu9+F6Y+Vv216b32ogZpRo5lvjZv4zX5rQz5Y6WPljXSpDGG wkOeSTiMfxiTM9PZBgzZtJ/7XiKNjRyFSfOvcSFGKtqzSjYkQzLDcG4eCAFCQAZMnKCr ujvC2U//PKrSRmbbt8DG8qBj5+Pc+0C9REy88sQGvemJwQiHzNFeDWZbQOKzpLYVuJMX 8vy2hh4bQ0Trr6NCCR5LQo5FL7mXD/GwbnD4n5C5JyCznu/J2AyZQzEYGFg+UOS+wsPY iyZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ug4UmjId; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id d12si15957315edx.464.2021.09.26.23.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 23:48:42 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ug4UmjId; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F8C9835FB; Mon, 27 Sep 2021 08:48:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Ug4UmjId"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE7EB835F3; Mon, 27 Sep 2021 08:48:23 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 7F5438348D for ; Mon, 27 Sep 2021 08:48:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x529.google.com with SMTP id g8so64906235edt.7 for ; Sun, 26 Sep 2021 23:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z/+PShzHeuWeSQbVu69qWjybFwLZgWZYSy7GBE68WGo=; b=Ug4UmjIdWY9u0Vl2g286VPFpoOaI5fw9WJtnu2O+4qcLU1CJN0q+b7QQlTXDUUrl3e kAVwCiqdCfBUVX+5yekujqeq2Twy9YJRjJGQZI1ehW6bakoKCM7mm3K+Mzn3jL9unrBd fKDAQGoK2sM08k7IqdvfvwKJ5Dz6QW1l1vUrt6Je976kB3HHxNT5fQf0ebipd/SjzJoi NNhnjezQEomzG2XpY1XTwerU6FqrcOZwXG1GAjgNrmuYrmKHOV/3XbTLnoIFd8LH5OX3 4XQUbwAM2eSiDYkWO5iN01CQMxnx2VZiKGTndvK2egAR7H9UrQDB4n+CQn/1T/AdZ8sO R+lg== 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=Z/+PShzHeuWeSQbVu69qWjybFwLZgWZYSy7GBE68WGo=; b=r1DyPBKt10Oz+Ff9Cpq8JB2nUZkHo4bplX8Wl1TXgLBUYhP7iTcagDQ14qV1W7fyya pkdCbvcOQ5J4uPyoaCFKQOytZkc/Xqzwkr5ImESU7KdSIpLWM6dotPKQdMC9fivWBhP0 Lhlhvv85+/cqp4ANXQZj5tSQgg1BXJg3GXGwx3+BReud1hchlqkEBh+/6hiolL1v6WBw cDXf3jP4wN+bwDAmhpUK2+9J5UH/JDUqOUsJyUyi6DElUTrD5AfW3L/Olro+vqrqHDU/ V6D3bgbb0ijekkaQDngH7qBsKiap3NiJtJJrcrcL377DJKlIDRdiOh2c5NTcvJNCgN/C hAEA== X-Gm-Message-State: AOAM531exPe9ILWgm0Kzz7S5UkXOBqItWlfne1DvhQn9iTfaUSmaODoa O051l/4Jsi0dXYuGzTiYbnmkLA== X-Received: by 2002:a50:cf4c:: with SMTP id d12mr21497773edk.115.1632725297968; Sun, 26 Sep 2021 23:48:17 -0700 (PDT) Received: from apalos.home ([2a02:587:4672:866:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id dm8sm9948398edb.90.2021.09.26.23.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 23:48:17 -0700 (PDT) From: Ilias Apalodimas To: trini@konsulko.com Cc: mark.kettenis@xs4all.nl, Ilias Apalodimas , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Simon Glass , Bin Meng , Green Wan , =?utf-8?q?Marek_Beh=C3=BAn?= , Sean Anderson , Lukas Auer , Brad Kim , Zong Li , Heinrich Schuchardt , Dimitri John Ledkov , David Abdurachmanov , u-boot@lists.denx.de Subject: [PATCH 3/3] treewide: Remove OF_PRIOR_STAGE Date: Mon, 27 Sep 2021 09:47:48 +0300 Message-Id: <20210927064751.78591-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927064751.78591-1-ilias.apalodimas@linaro.org> References: <20210927064751.78591-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 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 The previous patches removed OF_PRIOR_STAGE from the last consumers of the Kconfig option. Cleanup any references to it in documentation, code and configuration options. Signed-off-by: Ilias Apalodimas --- dts/Kconfig | 11 ++--------- include/fdtdec.h | 4 ---- lib/fdtdec.c | 2 -- tools/binman/binman.rst | 16 ++++++---------- 4 files changed, 8 insertions(+), 25 deletions(-) -- 2.33.0 Reviewed-by: Simon Glass diff --git a/dts/Kconfig b/dts/Kconfig index 39270b47f9f0..100769017e12 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -22,7 +22,7 @@ config BINMAN config BINMAN_STANDALONE_FDT bool depends on BINMAN - default y if OF_BOARD || OF_PRIOR_STAGE + default y if OF_BOARD help This option tells U-Boot build system that a standalone device tree source is explicitly required when using binman to package U-Boot. @@ -32,7 +32,7 @@ config BINMAN_STANDALONE_FDT directory for a specific board. Such device tree sources are built for OF_SEPARATE or OF_EMBED. However for a scenario like the board device tree blob is not provided in the U-Boot build tree, but fed to U-Boot - in the runtime, e.g.: in the OF_PRIOR_STAGE case that it is passed by + in the runtime, e.g.: in the OF_BOARD case that it is passed by a prior stage bootloader. For such scenario, a standalone device tree blob containing binman node to describe how to package U-Boot should be provided explicitly. @@ -122,13 +122,6 @@ config OF_HOSTFILE This is only useful for Sandbox. Use the -d flag to U-Boot to specify the file to read. -config OF_PRIOR_STAGE - bool "Prior stage bootloader DTB for DT control" - help - If this option is enabled, the device tree used for DT - control will be read from a device tree binary, at a memory - location passed to U-Boot by the prior stage bootloader. - endchoice config DEFAULT_DEVICE_TREE diff --git a/include/fdtdec.h b/include/fdtdec.h index 8ac20c9a64f7..d0e13fc18313 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -55,10 +55,6 @@ struct bd_info; #define SPL_BUILD 0 #endif -#ifdef CONFIG_OF_PRIOR_STAGE -extern phys_addr_t prior_stage_fdt_address; -#endif - /* * Information about a resource. start is the first address of the resource * and end is the last address (inclusive). The length of the resource will diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 7358cb6dd168..7b379564600d 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1580,8 +1580,6 @@ int fdtdec_setup(void) puts("Failed to read control FDT\n"); return -1; } -# elif defined(CONFIG_OF_PRIOR_STAGE) - gd->fdt_blob = (void *)(uintptr_t)prior_stage_fdt_address; # endif # ifndef CONFIG_SPL_BUILD /* Allow the early environment to override the fdt address */ diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index 09e7b5719825..614df541c5ac 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -232,18 +232,18 @@ You can use other, more specific CONFIG options - see 'Automatic .dtsi inclusion' below. -Using binman with OF_BOARD or OF_PRIOR_STAGE +Using binman with OF_BOARD -------------------------------------------- Normally binman is used with a board configured with OF_SEPARATE or OF_EMBED. This is a typical scenario where a device tree source that contains the binman node is provided in the arch//dts directory for a specific board. -However for a board configured with OF_BOARD or OF_PRIOR_STAGE, no device tree -blob is provided in the U-Boot build phase hence the binman node information -is not available. In order to support such use case, a new Kconfig option -BINMAN_STANDALONE_FDT is introduced, to tell the build system that a standalone -device tree blob containing binman node is explicitly required. +However for a board configured with OF_BOARD, no device tree blob is provided +in the U-Boot build phase hence the binman node information is not available. +In order to support such use case, a new Kconfig option BINMAN_STANDALONE_FDT +is introduced, to tell the build system that a standalone device tree blob +containing binman node is explicitly required. Note there is a Kconfig option BINMAN_FDT which enables U-Boot run time to access information about binman entries, stored in the device tree in a binman @@ -252,10 +252,6 @@ For the other OF_CONTROL methods, it's quite possible binman node is not available as binman is invoked during the build phase, thus this option is not turned on by default for these OF_CONTROL methods. -See qemu-riscv64_spl_defconfig for an example of how binman is used with -OF_PRIOR_STAGE to generate u-boot.itb image. - - Access to binman entry offsets at run time (symbols) ----------------------------------------------------