From patchwork Thu Sep 30 07:17:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 514882 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp803297jam; Thu, 30 Sep 2021 00:18:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9Hf55CLhAeANp1Lk35awOAZobCddtFinAmhne6udXvFvEjABIRWrTBi08YiM10kp6yQfQ X-Received: by 2002:a17:906:1848:: with SMTP id w8mr370782eje.485.1632986320892; Thu, 30 Sep 2021 00:18:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632986320; cv=none; d=google.com; s=arc-20160816; b=jpNckfpk6loiFsbl8bUDZtm6kqBPdhVpQWtoXQ7GyzimQ/IoAFgJ2nKJGpz6YHouVF fuLM4bATWbTXQjNibmoZEmd//FitUt4P44+Ot3Y+VZEposaNhvQLCjr/WOday0Iozxfj +fUnmc/OPQVKhkc9cLenvz/DwYPPAzTR4/lN2LtSSD03ojE1iKzxwVejvpGgu/vGzryJ msEszpRs3gAGm58ZWkuHhXtgEVgJsM3dIgGucd1bKe9O+LthAAHkHjyIzeA+vvory3Dx LcQsushTCBAvRL+WL83e4Q6wXbuoyE7xXD1RonIfvd8VanT05sZh2binOfu7EBhJ5P12 bOxw== 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=lwwWQULV4AnFjPwr5ar3GtVC5anUdxt1Tx5gqUno98g=; b=XYWzX4yhlJNEcByIWT4iEWRlA+L3QELx0dlW6/3NhQYFvmD41yAKWh73AX3qEElPAr Q7H/fah579Nooul7NINFtZdOsucb8zWerwKmMVugHfeur1SyK+nwGN9K1H7PqhJA9Qme AWLcQfl7vUUVNJssEZgbUm2wJxkFHjDQTVYYyFcvmr8sxl2v2BQnZHmjmA8p4Cxbe8Bh Iljk11smtHtzZhL5iIAx50TgV3JJxAk3boAo1WYL+RVG/5S5g8PHjPZcjQwbqSaLy6Nq t0lwmHRmBNE3qxGzN6JgJ7w9zqROtyUCM9LIKj6OrSDtSNO12oywPd6m8mDS5RmSKueL kUPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kN8qdCoY; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id hy4si2807193ejc.575.2021.09.30.00.18.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:40 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kN8qdCoY; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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 439E6815B7; Thu, 30 Sep 2021 09:18:32 +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="kN8qdCoY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C8897812BC; Thu, 30 Sep 2021 09:18:22 +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-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (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 EEF6E811CE for ; Thu, 30 Sep 2021 09:18:14 +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-x531.google.com with SMTP id bd28so18203445edb.9 for ; Thu, 30 Sep 2021 00:18:14 -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=lwwWQULV4AnFjPwr5ar3GtVC5anUdxt1Tx5gqUno98g=; b=kN8qdCoYkXfzYnc/ogV4637mlchZ/SOaDm4w52QJPTwjxSsUIJyahq3UtcowadNuEC bFKpBD041kWxiwtGs63/HrNxXLv2nWqNzxz5s2i0LVSzG3KOuQRCUuOII1mM1X1FMjE2 cQHsQaX/ZNCcBg/gNA05Fs8D1HgiXNqljNEBFQlq7ynzwiGeDX8C42HUHnvtT5LFnaLT jGXY6vT0AmstmSxUVWPup0S5bc3A9wew/VIxF7ku+WbL6nRm3i7YJGATuyMdezzd3MtB EQ9f2KtLhuSWF8t7bg6CtnVMTFksucgBMyB/AtkqAjkoz1y0StByZYq1cQr341yJEX8y RPKg== 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=lwwWQULV4AnFjPwr5ar3GtVC5anUdxt1Tx5gqUno98g=; b=dj+VxmMklE3T19qWJcBSp7JjQHMfNnh7TdP6g2jJ4cklelgDXuYRCmZ05cef+4eElu VdyF1tUgc2fYmm6/FVTYszuYN7eksanW1ESjgUk7rAP6qXfDj8/98c4367khPVJlxPtr JCOzCZNtu+GcYzOKusj8mae+1LmE8Cl3UlekyYhGpJdLi9+LsoBy1pmmAAeyJvs13a/I RQuzAResTv1jO++/WQ8yb3bmmPCo9CU5la9MbB6rZrY8dCXfy/s9o34SRcIPOOyenN+Q zbuQXBc5s/mBNW1U/a0s4HwvDPkIcqLEOSDydLsGqPbIr8eBhgl/xPPAtQ7/esASYAWj k3aA== X-Gm-Message-State: AOAM532O5fjiep5irMjO1rXwNkm0VUc611L1JHsYdbC7lCPd+49WggW4 JliNwLkQ8TGZviX5XhPywfV9HA== X-Received: by 2002:a05:6402:5171:: with SMTP id d17mr5347364ede.364.1632986294464; Thu, 30 Sep 2021 00:18:14 -0700 (PDT) Received: from apalos.home ([2a02:587:4672:866:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id dj8sm1005173edb.53.2021.09.30.00.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:14 -0700 (PDT) From: Ilias Apalodimas To: trini@konsulko.com Cc: mark.kettenis@xs4all.nl, Ilias Apalodimas , Simon Glass , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Bin Meng , Green Wan , =?utf-8?q?Marek_Beh=C3=BAn?= , Brad Kim , Heinrich Schuchardt , David Abdurachmanov , Dimitri John Ledkov , u-boot@lists.denx.de Subject: [PATCH 3/3] treewide: Remove OF_PRIOR_STAGE Date: Thu, 30 Sep 2021 10:17:57 +0300 Message-Id: <20210930071800.443059-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930071800.443059-1-ilias.apalodimas@linaro.org> References: <20210930071800.443059-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 Reviewed-by: Simon Glass --- Changes since v1, v2: - none 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 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) ----------------------------------------------------