From patchwork Thu Sep 30 07:17:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 514880 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp803016jam; Thu, 30 Sep 2021 00:18:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyQ5QHqMXV3P7xMAlAhCD1WMH+5zyMl2Fxivdxb/NK7OpyS6RFI3uJy6PbjKPwknvzmYmU X-Received: by 2002:a17:906:3542:: with SMTP id s2mr5184443eja.379.1632986299936; Thu, 30 Sep 2021 00:18:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632986299; cv=none; d=google.com; s=arc-20160816; b=MMnrcz8gxTbrjs0VWaD/5CYZN2EvxdR5WGp1H9eddKQ5bWCDHu82HBuAFRcdz+zZLX JBTCnHxEpIUx7/voA5khJDRERrryENWLjElxUHk+2U92H5LQpvnic1+IyStcTCec0Uqd AgT7RVbYUsD+XKfe9uKMZFR7cwu7fra4XRpGMvSRRTIg5wKk/vnAsXLEZXLf7lDMBNJA Lyt/i/6zOLFwXcTbH4IfUGJoLWM7A5jkf2Rd6324p/QfePSjhGwBMedgD0ljOFyIz30l +0pyfd14M/Y//I+HvTR+3Ymi7Uy6diwgfqrWGK0gB63eXG/16OWRCwEpAtwzpOlYuaQp PIFA== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=cKy1lQhrqHCbTGw8DJ5Fj0VBrqR7ZMTeU2AjfvpFWB4=; b=dp/8aFdcRllb4nBYEn9LZK8EVZL+6QzuQC/B5Sb9wtLllMqQ5MY+JxkBftm38MBP6K zhmEMRsk0P1veTqUBLFaGYsn1TNqGqRjxjD8dj/eAc7Iol6C/U09n4Wyt2ib4CmFKszp 2oFk4gcnIIi599SnnojhheKR31/e2T98vxBggzKIamskv0mttxDB8CMVIyGyujApRjp2 pLUXZ3MJKAw+6ZW9d4Phw6gtduSAIWr/3PGuARTe09s61ls4kbl37I6er81rRjo1YYjK S9F2L7OOVFavKDPc0jVkEDFV7dowg0Y+gTHo/2vsokLM5/s/YSMljHLlSPp+n0bWZq1r yCZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=keGeJjek; 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 l17si2435882edj.620.2021.09.30.00.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:19 -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=keGeJjek; 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 D816B8119C; 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=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="keGeJjek"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE5F58169E; Thu, 30 Sep 2021 09:18:11 +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-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (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 7AC8D80F1A for ; Thu, 30 Sep 2021 09:18:06 +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-x533.google.com with SMTP id r18so18141607edv.12 for ; Thu, 30 Sep 2021 00:18:06 -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:mime-version :content-transfer-encoding; bh=cKy1lQhrqHCbTGw8DJ5Fj0VBrqR7ZMTeU2AjfvpFWB4=; b=keGeJjekXe6d7TEUebov4VTCWQZks94NyMqyS9fJVM9Rv9jJITxhFvHdMGMAwpqDwO Htzo5wNnQswyN1EkB/1mkbWn4YEijNLVTCQJJyIPVjXYvxNgzPUrOcw0hcGE5elaJku4 kAh85qgOA05Wa/bzAETI68l5pIaP+ExSgKcs9+pAXTMByFtqg4kXvbv8trz3c8nsUHOX r8HAqUOQGc9JemC/vGSovI9D3KF4LpbUbZOQNohdP2BD5Yst0W2eQMjSF9UM3rxMHEs1 a1UmxDnGkdq0/B2Y5ipXRtyR3yLLCmG5xXe/spa8ZMggXgp+bw7mnDUSLa42ggTxnvxP pt8w== 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:mime-version :content-transfer-encoding; bh=cKy1lQhrqHCbTGw8DJ5Fj0VBrqR7ZMTeU2AjfvpFWB4=; b=t33UvPOVLIwl/e3Rux+EjcnNTEf/04z5Prb7M7tdCxx6MG3MpstupczUk0Em5RymJ3 HP0qsnxJV79XC9FroUX5ZkSrNycaJ6kPfdgOqcg3kq1S9pbKEcEdtw60jDwE9JykL5fS kfOPkd+NRzEjGgfJK46R5dnW+L50ErVutelipyLDtLF1ca9RlYShPcDoTo5WFiXLW5Lc i5bVpdki+Dn7w+wVR11wVQHi30Q3yGwZfjTGwM7TKHAq9dAFNa4j+EHDW+uuEi6wg2Tz BIyAuyjxLRHFKuXzg7l4gIGJpMpnh8vIwm3Ab7M32UsdvUnS5X22jnq3vLTe9V7INaf0 HqAQ== X-Gm-Message-State: AOAM533S3QVUV9p6J498JFAp7m6J0WyQU0wyo7lbmpfwLgQjudl5LOHH EIrO83tBhdMyENZ+w1cathAHjA== X-Received: by 2002:a17:906:49d5:: with SMTP id w21mr5002566ejv.30.1632986284129; Thu, 30 Sep 2021 00:18:04 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:03 -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 , =?utf-8?q?Marek?= =?utf-8?q?_Beh=C3=BAn?= , Green Wan , Brad Kim , Heinrich Schuchardt , David Abdurachmanov , Dimitri John Ledkov , u-boot@lists.denx.de Subject: [PATCH 1/3 v3] riscv: Remove OF_PRIOR_STAGE from RISC-V boards Date: Thu, 30 Sep 2021 10:17:55 +0300 Message-Id: <20210930071800.443059-1-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 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 At some point back in 2018 prior_stage_fdt_address and OF_PRIOR_STAGE got introduced, in order to support a DTB handed over by an earlier stage boot loader. However we have another option in the Kconfig (OF_BOARD) which has identical semantics. On RISC-V some of the platforms pick up the DTB from a1 and copy it in their private gd_t. Apart from that they copy it to prior_stage_fdt_address, if the Kconfig option is selected, which is unnecessary. So let's switch the config option for those boards to OF_BOARD and define the required board_fdt_blob_setup() for them. Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass --- Changes since v2: - Adjusted board_fdt_blob_setup() for ax25-ae350 to cover OF_BOARD cases Changes since v1: - Remove the sifive unleashed/unmatched changes, since they'll be handled arch/riscv/cpu/cpu.c | 3 --- arch/riscv/cpu/start.S | 5 ----- arch/riscv/dts/binman.dtsi | 6 +++--- board/AndesTech/ax25-ae350/ax25-ae350.c | 7 ++++++- board/emulation/qemu-riscv/qemu-riscv.c | 9 +++++++++ configs/ae350_rv32_defconfig | 2 +- configs/ae350_rv32_spl_defconfig | 2 +- configs/ae350_rv64_defconfig | 2 +- configs/ae350_rv64_spl_defconfig | 2 +- configs/qemu-riscv32_defconfig | 2 +- configs/qemu-riscv32_smode_defconfig | 2 +- configs/qemu-riscv32_spl_defconfig | 2 +- configs/qemu-riscv64_defconfig | 2 +- configs/qemu-riscv64_smode_defconfig | 2 +- configs/qemu-riscv64_spl_defconfig | 2 +- dts/Kconfig | 2 +- 16 files changed, 29 insertions(+), 23 deletions(-) -- 2.33.0 Reviewed-by: Simon Glass diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index c894ac10b536..e16f1df30254 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -16,9 +16,6 @@ * The variables here must be stored in the data section since they are used * before the bss section is available. */ -#ifdef CONFIG_OF_PRIOR_STAGE -phys_addr_t prior_stage_fdt_address __section(".data"); -#endif #ifndef CONFIG_XIP u32 hart_lottery __section(".data") = 0; diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 308b0a97a58f..76850ec9be2c 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -142,11 +142,6 @@ call_harts_early_init: bnez tp, secondary_hart_loop #endif -#ifdef CONFIG_OF_PRIOR_STAGE - la t0, prior_stage_fdt_address - SREG s1, 0(t0) -#endif - jal board_init_f_init_reserve SREG s1, GD_FIRMWARE_FDT_ADDR(gp) diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi index d26cfdb78a9e..5757ef65ea4b 100644 --- a/arch/riscv/dts/binman.dtsi +++ b/arch/riscv/dts/binman.dtsi @@ -48,7 +48,7 @@ }; }; -#ifndef CONFIG_OF_PRIOR_STAGE +#ifndef CONFIG_OF_BOARD @fdt-SEQ { description = "NAME"; type = "flat_dt"; @@ -60,7 +60,7 @@ configurations { default = "conf-1"; -#ifndef CONFIG_OF_PRIOR_STAGE +#ifndef CONFIG_OF_BOARD @conf-SEQ { #else conf-1 { @@ -68,7 +68,7 @@ description = "NAME"; firmware = "opensbi"; loadables = "uboot"; -#ifndef CONFIG_OF_PRIOR_STAGE +#ifndef CONFIG_OF_BOARD fdt = "fdt-SEQ"; #endif }; diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index 81b0ee992372..6de91208258f 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -21,7 +21,6 @@ DECLARE_GLOBAL_DATA_PTR; -extern phys_addr_t prior_stage_fdt_address; /* * Miscellaneous platform dependent initializations */ @@ -57,7 +56,13 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) void *board_fdt_blob_setup(void) { +#if CONFIG_IS_ENABLED(OF_BOARD) + return (void *)gd->arch.firmware_fdt_addr; +#elif CONFIG_IS_ENABLED(OF_SEPARATE) return (void *)CONFIG_SYS_FDT_BASE; +#else + return NULL; +#endif } int smc_init(void) diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c index dcfd3f20bee6..aa91ca91325c 100644 --- a/board/emulation/qemu-riscv/qemu-riscv.c +++ b/board/emulation/qemu-riscv/qemu-riscv.c @@ -14,6 +14,8 @@ #include #include +DECLARE_GLOBAL_DATA_PTR; + int board_init(void) { /* @@ -69,3 +71,10 @@ int board_fit_config_name_match(const char *name) return 0; } #endif + +void *board_fdt_blob_setup(void) +{ + /* Stored the DTB address there during our init */ + return (void *)gd->arch.firmware_fdt_addr; +} + diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig index 4e7a1686a64d..8b6c0b8a4a0a 100644 --- a/configs/ae350_rv32_defconfig +++ b/configs/ae350_rv32_defconfig @@ -15,7 +15,7 @@ CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_CACHE=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig index 34c6af6e7e17..a0fe9b9a71df 100644 --- a/configs/ae350_rv32_spl_defconfig +++ b/configs/ae350_rv32_spl_defconfig @@ -19,7 +19,7 @@ CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_CACHE=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTP_SEND_HOSTNAME=y diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig index 05eee371ac2f..cb23cbd3d95e 100644 --- a/configs/ae350_rv64_defconfig +++ b/configs/ae350_rv64_defconfig @@ -16,7 +16,7 @@ CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_CACHE=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig index 9cd7848c92eb..9ad312505db3 100644 --- a/configs/ae350_rv64_spl_defconfig +++ b/configs/ae350_rv64_spl_defconfig @@ -20,7 +20,7 @@ CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_CACHE=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTP_SEND_HOSTNAME=y diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig index 8ac16cf4186e..6fe133c268d7 100644 --- a/configs/qemu-riscv32_defconfig +++ b/configs/qemu-riscv32_defconfig @@ -9,6 +9,6 @@ CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y # CONFIG_CMD_MII is not set -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y diff --git a/configs/qemu-riscv32_smode_defconfig b/configs/qemu-riscv32_smode_defconfig index 05eda439618f..c67e8206d1ab 100644 --- a/configs/qemu-riscv32_smode_defconfig +++ b/configs/qemu-riscv32_smode_defconfig @@ -10,6 +10,6 @@ CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y # CONFIG_CMD_MII is not set -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig index ee81e552724d..77e81fac3af7 100644 --- a/configs/qemu-riscv32_spl_defconfig +++ b/configs/qemu-riscv32_spl_defconfig @@ -12,6 +12,6 @@ CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_SBI=y # CONFIG_CMD_MII is not set -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig index daf5d655d01f..90e87672aab0 100644 --- a/configs/qemu-riscv64_defconfig +++ b/configs/qemu-riscv64_defconfig @@ -10,6 +10,6 @@ CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y # CONFIG_CMD_MII is not set -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig index 4a6416e2540b..0a8393903368 100644 --- a/configs/qemu-riscv64_smode_defconfig +++ b/configs/qemu-riscv64_smode_defconfig @@ -13,6 +13,6 @@ CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y # CONFIG_CMD_MII is not set -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig index 429d4d814e65..a15e82dd3ee1 100644 --- a/configs/qemu-riscv64_spl_defconfig +++ b/configs/qemu-riscv64_spl_defconfig @@ -13,6 +13,6 @@ CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_SBI=y # CONFIG_CMD_MII is not set -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y diff --git a/dts/Kconfig b/dts/Kconfig index dabe0080c1ef..39270b47f9f0 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -107,7 +107,7 @@ config OF_EMBED Boards in the mainline U-Boot tree should not use it. config OF_BOARD - bool "Provided by the board at runtime" + bool "Provided by the board (e.g a previous loader) at runtime" depends on !SANDBOX help If this option is enabled, the device tree will be provided by From patchwork Thu Sep 30 07:17:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 514881 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp803168jam; Thu, 30 Sep 2021 00:18:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmPxEGWDa5onhM0HnUk2qXxBz025/HmQ7qXbvvc8NKpETP/g1oMgFOgXXcHLq8B5tT5Mol X-Received: by 2002:aa7:d491:: with SMTP id b17mr5452104edr.210.1632986310144; Thu, 30 Sep 2021 00:18:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632986310; cv=none; d=google.com; s=arc-20160816; b=YMbQDmsGBDZMgd8edYq7c9v1Iq+S/B5wtr7DCZs1swCmMwtdl2e0jcBQR2BwD2UvE4 wTajVy0BKa4alVmL1+x16ZM9pFqQWnWSpemkNLp8fvPsIAEfKBNvyOIBRGLfeSLUfxxy 041qX3bPbD9wgIbAHg1xt+1KYCBbRzKaDTnZxveViNli51hhZCw2u4VPlcLex9AR6odD 4scqqOwQ8xR/fHoQ5+yUdvj4mfQrSP82UwLt8vA2JldsHRGuzi8Gn60WniqRb82VGEdL Va95gIHieeerdFIeQv+MRxZ9qTCnuYD5qFhFN4paZM1zOwZrS+MmZBIfeir+b1qK9qva EWsQ== 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=Jk2fZnW569wAjMZyjs6qiFYZ0KNYw0fIp4nKLplbjFs=; b=VCmDrm84Th2VAkDj3jkP0580sgebwlhaZ0LxTvwDdODDOisOAnMTntA8scbC3m0yVG migLxtfaUMj+pmWn9OVvcXQrvtWBiR08lp2SSkt27gyijlP/LIjhzjw3NqtZgfDGz46f TFQTS9BhioSoCOAnL0xIXSPYOi3DYXJuBIutjyH6S8IdU7sEDc255VZjo5elzFwVU/CZ nJim/M3ERqL4jjxVRX9F3DvuEeYeHdLftEAQIHhduuaoDzlw5zdeHWd7aiCGbY8aienN ciMewHDJgBY7G4TZGlXEoyqbt0nZgPv6gRWbMZrNyAUIccCEOJAiPh0HXQzAXo8xqI6x 73uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fWVNvNuh; 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 m15si2546167ejl.105.2021.09.30.00.18.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:30 -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=fWVNvNuh; 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 6F833812BC; Thu, 30 Sep 2021 09:18:28 +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="fWVNvNuh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7C11B812C0; Thu, 30 Sep 2021 09:18:18 +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 5AB2D815A8 for ; Thu, 30 Sep 2021 09:18:10 +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 b26so18561893edt.0 for ; Thu, 30 Sep 2021 00:18:10 -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=Jk2fZnW569wAjMZyjs6qiFYZ0KNYw0fIp4nKLplbjFs=; b=fWVNvNuhfziA/1X/0tk9zaizOEs8FFC8QK2DvmPZlF2FqiTM6eg6XcbBgHfywz9Ns0 Oqveksx4qQRAENGE/jF13i9v6dCAdncA2qsjqlKn66M+3C69MLUimz9X/eL55ahxK4e9 K4604v7JdDBj6JGCQoxmIzP5XBDm69LTxGxO/neDdYEPrFmjhvg/DLABsGGRdX9zAgp7 br388pW4jqRbBVnSkfcV9FtYYl4Pjtwv7kUpie/7JgfDkPnb61I4yr6S8UaoBXUkRPdh CfOAFBq7KW5Fa6p4ohEAv8JNQC2T2yS/AGvfKvZXR2ob9UH3qZLVHqYfX8YAMEfLucAH yPSw== 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=Jk2fZnW569wAjMZyjs6qiFYZ0KNYw0fIp4nKLplbjFs=; b=ErxtyiyPcIvlPXYvjrjroMuekhqTS9PkyruWHEnwrjQ58omxRZuieMCjX+hESm8v9C YCJKGRUr37keo9mjAxDk9s+IoUh4vDVxu8JEHUDJ/hvVJ4KWdDZGVIOcNjSwQne51lSE Wwwcn1d83+k0vyuhfaYVQNN+59GJHFR6TvVlbiuYVs68bZJKdZT+Igsiu4REgTa9VnHE SVG8A2zi4/5Nzna2lCFYpRuTM5Rtd5x7LbzB4s0pI+OdNH1jknHmp+qeVW57P03mVtIw Fj/5eGWcody4dfmpsLIzGPwh8v8TVkMDOc8Iuhvii8bRP+Cnla8U/k4SJCwOv4Tt5y7X +xAw== X-Gm-Message-State: AOAM533Ok7YC5e96gjckKnnWGxObkr/UKgn4VxB9rFRnb/eWbQPY3VaL irfFykUKVKA0fIkOt4K9US0P2W+3qcXfqP5H X-Received: by 2002:a05:6402:493:: with SMTP id k19mr5252193edv.386.1632986289293; Thu, 30 Sep 2021 00:18:09 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 00:18:08 -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 , =?utf-8?q?Marek?= =?utf-8?q?_Beh=C3=BAn?= , Green Wan , Lukas Auer , Brad Kim , Heinrich Schuchardt , Dimitri John Ledkov , David Abdurachmanov , u-boot@lists.denx.de Subject: [PATCH 2/3 v3] board: arm: Remove OF_PRIOR_STAGE from the remaining Arm boards Date: Thu, 30 Sep 2021 10:17:56 +0300 Message-Id: <20210930071800.443059-2-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 At some point back in 2018 prior_stage_fdt_address and OF_PRIOR_STAGE got introduced, in order to support a DTB handed over by an earlier stage boo loader. However we have another option in the Kconfig (OF_BOARD) which has identical semantics. So let's remove the option in an effort to simplify U-Boot's config and DTB management, and use OF_BOARD instead. Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass --- Changes since v1, v2: - none arch/arm/Kconfig | 1 - board/broadcom/bcmstb/bcmstb.c | 6 ++++++ configs/bcm7260_defconfig | 2 +- configs/bcm7445_defconfig | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) -- 2.33.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b5bd3284cd1c..8bc4391fcb27 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -620,7 +620,6 @@ config ARCH_BCMSTB select DM select GPIO_EXTRA_HEADER select OF_CONTROL - select OF_PRIOR_STAGE imply CMD_DM help This enables support for Broadcom ARM-based set-top box diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 076ac9414418..40d9def24b7b 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -135,3 +135,9 @@ int board_late_init(void) return 0; } + +void *board_fdt_blob_setup(void) +{ + /* Stored the DTB address there during our init */ + return (void *)prior_stage_fdt_address; +} diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index a42a6acb06d5..be0c945dc811 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -22,7 +22,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 96e8da0748ae..9ab72dcf37c7 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -23,7 +23,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_BOARD=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y 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) ----------------------------------------------------