From patchwork Mon Oct 11 21:00:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 515625 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4821310ime; Mon, 11 Oct 2021 14:00:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxdevN3Jjv3nmaFpN5UsMwKFg86yvMV9MFHkEcOWrccAuRDwOm9aCYHueCdxbEspUYsBWc4 X-Received: by 2002:a17:907:76e1:: with SMTP id kg1mr28595952ejc.329.1633986034719; Mon, 11 Oct 2021 14:00:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633986034; cv=none; d=google.com; s=arc-20160816; b=fzSDyGr/MbNrOp8yKq/FQ9bWdvIaRHwTYanRT+9BzMuZeXw7FWz7IFkOwShU/R0BcB kZYLmBs9xN/dT9GK7MVG4u22MQaYVWk0s5JT1xjNIfXhVbPCOQLz44aACYBYkdzncK/A zJ9xUC989o2imtBigShQFQn4f5jrqb8ikL3s0xVPg4FbGH40Jbo4T3aY3QApIkC3E7wU 5vzvIPHgFwmLdFZyndzB79fMfOsUwr4D2tRjVGTOAH5bzuVnmICsEeIisMCS6vN06v+V XG3deFq9UJzjOvkghINuXgg3XTq1SGeT7iDrt95wukWyEMBH4KkT91Tpg++iKYkLXMxG zINw== 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=kSH/tfhUM3YiCOguLCZT8HQ/q6nQxi6oTPbK0ZZB+q4=; b=ORzhPm4bnFAreTEkOJWZdqr6Jn5gB2LKqr3jgH5/tUccE7jG8m+eWJMnd+VApwrTZg yfVM2euXsZkj5BPqg31B4FW19hvH6SCah1BxCxl85kwjN6cKKLuX4ju79PyiqEvYKWGY kkwWsalAy6wiFZiBvi0Fqh6YiDmdalbEq8oeAbBEk59kZVfUwOqWgO8XIXUNlH2yFRS6 OLrjotYQg2KOd3GQqvttcW8s8LPZ9xjEJYtI3+By9UFCGXfGe2Trfvd7enp/EyOK3UpA gbW/1YYR27lv5kz1kFKfTqn5ySUFoGA38iGSFzfpJNKlhi+eqDYgHZuQJYQqwdU3+Esb gLGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="tyh/5kj5"; 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 ce28si11828929edb.3.2021.10.11.14.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:34 -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="tyh/5kj5"; 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 B303282DF9; Mon, 11 Oct 2021 23:00:29 +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="tyh/5kj5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6C6BC83465; Mon, 11 Oct 2021 23:00:28 +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-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 03B1082DA1 for ; Mon, 11 Oct 2021 23:00:24 +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-x536.google.com with SMTP id g10so71832015edj.1 for ; Mon, 11 Oct 2021 14:00:23 -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=kSH/tfhUM3YiCOguLCZT8HQ/q6nQxi6oTPbK0ZZB+q4=; b=tyh/5kj5m1EngKEjIirm34R74K3z2HZFjy2ADQfI3n2mfAjmFGzYPJxBw1Pr1NDGm2 V7Dkat/Boc5uxwcbhwkFKpmnGSkjHJrsO7WwftjwE8oZNNSW5nre188w1IbAQTpq5xAd +M1BaLMZ2DaxZFzy3B6EpCi36Ky4K3+q7l3DKVtUhV+6SAg6y38djYdQz0HB8kFGr6B8 h7BHbCDd78jL+3VCRmjtPUH+9sokmHfJS2OZ+X5sKbEgU8ZboqIGuIFzDwhkYn8vA1ru JpRhkveqHygm5iqq+LXbx7jmZ2ogaPI1lRvOEtoIrf53p/ePH1cW4c9dY99ftlyUzniA wtlA== 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=kSH/tfhUM3YiCOguLCZT8HQ/q6nQxi6oTPbK0ZZB+q4=; b=xN/eOTxsYxkt77V2RhVGCCXKwmodqQN3Dc/7hf8szBeWEW0N1V9seqtjsDCIg+Lgu6 XsnTW3IpWejW0PjHSoVynd0QextegU9bSnVIAJxWG46CcbNlfQkk0/ZEvGoLLMaQXK30 MBFUAOI3nVMXWmDegWkUyAxVyusgB/dO8ebtJRPFacb512TknCbQpvsoIkr1vk1+SRkW eE/RTKpM073vexdMrkxwmhlQVjg60pgX/+mRq9G3BYZ1CX0FVf2t4EfSkGcwkIyDAzPI 4oLitzD1Mu6gnFpaSztmpw7NqaYKqbeIs55hfXSqhhw0kNc0tVhV1iklLK6SXsHK4LHo D7eA== X-Gm-Message-State: AOAM530LLT+Os/oLnnAUrbxZnNGrDaoT+/z14NqPeiQiCD8uqdkRKnzg zQ4ajrjP3hTgFfMkWIB13xP7lQ== X-Received: by 2002:a17:906:354a:: with SMTP id s10mr29360030eja.475.1633986023464; Mon, 11 Oct 2021 14:00:23 -0700 (PDT) Received: from apalos.home ([2a02:587:468e:477f:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id h18sm3987233ejt.29.2021.10.11.14.00.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:22 -0700 (PDT) From: Ilias Apalodimas To: sjg@chromium.org Cc: Ilias Apalodimas , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Bin Meng , Green Wan , =?utf-8?q?Marek_Beh=C3=BAn?= , Lukas Auer , Brad Kim , Heinrich Schuchardt , Dimitri John Ledkov , David Abdurachmanov , u-boot@lists.denx.de Subject: [PATCH 1/3 v4] riscv: Remove OF_PRIOR_STAGE from RISC-V boards Date: Tue, 12 Oct 2021 00:00:13 +0300 Message-Id: <20211011210016.135929-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 boo loader. However we have another option in the Kconfig (OF_BOARD) which has identical semantics. On RISC-V some of the boards 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 v3: - fixed a wanring for qemu 32bit compilation - corected commit message - removed empty line from qemu-riscv.c 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 | 8 ++++++++ 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, 28 insertions(+), 23 deletions(-) -- 2.33.0 Reviewed-by: Leo Yu-Chi Liang 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..b0b6e20e9f9d 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 *)(ulong)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..2a26e265ffb9 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,9 @@ 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 *)(ulong)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 Mon Oct 11 21:00:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 515626 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4821492ime; Mon, 11 Oct 2021 14:00:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMZ38116lnrj4PARQa3oJb4/ROSPbiDEv0B1MBFG1hg9rwylwgXCZjtJl85QN916m+3BBD X-Received: by 2002:a17:906:bfe3:: with SMTP id vr3mr28123954ejb.339.1633986046963; Mon, 11 Oct 2021 14:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633986046; cv=none; d=google.com; s=arc-20160816; b=rJvyWUkbilcNLgm3om2vk/+6ja7Y6o5UpJlPNUNlVmE5RGPnLhf+3PxPtuDI3WtrCP fUgvIuXFxqwqS+qA2Vhu8cZNR3Ks0b11+J1gyyabt022xd2W5yN6MqcDOoOlVAiYNuEg Lz1WNkzTxNzLbiFKNHhwhO4iC0FFG619y2EgPrC9b1m7W6v/8B0VlW8dZnmD5Epw8McB XESnN2gCAPTF4nyY5aJEfQNDUkf1Jzummx7o0PyeKvZAcF2S0aQSGkwq3ROIOfbpLxBJ l9BvWyamcAAulrguPL9xb2rjpeWy/iJweR4OQI6/c0EHHyenilex4HY1jkI7RjOt9lI8 TKbA== 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=Y6+3ae0kKNZY/k5O4cThUgVClCYseqAQIDCidzcU8GY=; b=u1H0dfmL7fiaGZ68pIwpEYHzJKeaRomIqYLsGms0hBxHXljMrAf1IkkqwkIAw06LQp tZSNvm/LPhSLSpvw70F9m7sQbBMs5yF5wMgOdlNzKIm1kVIlvPxGvd1W/4Ah+sEtfQwq KBHQPIezRy/bOxJAgWwY6R/GxxGz0W5kvh1MbQ/HjwsNiBZ83Hy6GJDFs1apL9EdG3d0 i7+FS49S3K5yPnM4esWWLEPfhvW4EM1XDkUJt2i6/6/zjIY1KgVhP165WtoZTKiywySa BrMx59m1Q4j2LVORMpAkTmJLMi8Lr2rH/smPcQAK4lPt/eBzUeXFOsTYSuvrDWH5HhNu KWtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=meErCXLp; 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 kx3si15686742ejc.108.2021.10.11.14.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:46 -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=meErCXLp; 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 0D93C83709; Mon, 11 Oct 2021 23:00:40 +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="meErCXLp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 13E4283465; Mon, 11 Oct 2021 23:00:33 +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 4372883143 for ; Mon, 11 Oct 2021 23:00:27 +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 d9so48634212edh.5 for ; Mon, 11 Oct 2021 14:00:27 -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=Y6+3ae0kKNZY/k5O4cThUgVClCYseqAQIDCidzcU8GY=; b=meErCXLp1nBgVeQzwwuzfNdxLTd1ou+SBIuVHRJZ1HhPNZj2tA5dHPBT5awkiXIFaD ay7gEeekvf5e/xe5bJdiJnkVgqQCC7rNXeszj73PnsO4WkuUpvJINtPc3NZOh/hf1yvE 0B+poipgyALehqLLr/W7CTJe0hx7OIQG3/7BGHQvVcQqc/r41mLWUW0jOIOa0L8hw3zo LtyG+iExmP/dLPfMRn5EXQuras9mv260fpuyDfam/61QxuHCJoExzcPYGjxXr5BhLYuh 6ROHI14dNx5jwuzGQ3s3WV/rcTiVtSH+cD6f6Izp48MQIVcCJ3xMyhI32K8jmENq9BIK mJRQ== 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=Y6+3ae0kKNZY/k5O4cThUgVClCYseqAQIDCidzcU8GY=; b=BkXqiPU1FYWehiL/HUzcheyuSLATh1ZRb3hDeMm6tzpCr88pN/I7EhMhLthmuD+vgj dPW6Tl8ju6KL1vOPldrCe6+mdfpd0DVVwlTHbjAC9Kn5Cpm3vB66iIcVQFOcfsC9d7/n RruKCvhMWcgUK9V9m06K4bPm3GS5YJTgvSn8uBnMYW8GTdqlgxFrhZP3SuOSnYjnqz+C XhET8byBEZjcWrCD/MKMOjj3kLRalzc/vXSdOSbsP4wPda0yHPE9bmCJOrVkpjeMHZoi QWgZ3tqzzzuZTpkTlB2alcRY3zshNcyCYkaFVNH8Sw7clNMrvCHQ0YSwWo06HlHs9V9Y ohDw== X-Gm-Message-State: AOAM530YhPRHUmigg8xJarmFMDxVK3SXV7DSiAVewueP+Jdhf//skXwX jxmy8OEmo2a58NhMdZF+krSmMQ== X-Received: by 2002:a05:6402:1e88:: with SMTP id f8mr36739890edf.247.1633986026900; Mon, 11 Oct 2021 14:00:26 -0700 (PDT) Received: from apalos.home ([2a02:587:468e:477f:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id h18sm3987233ejt.29.2021.10.11.14.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:26 -0700 (PDT) From: Ilias Apalodimas To: sjg@chromium.org Cc: Ilias Apalodimas , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Bin Meng , =?utf-8?q?Marek_Beh=C3=BAn?= , Green Wan , Brad Kim , Heinrich Schuchardt , David Abdurachmanov , Dimitri John Ledkov , u-boot@lists.denx.de Subject: [PATCH 2/3] board: arm: Remove OF_PRIOR_STAGE from the remaining Arm boards Date: Tue, 12 Oct 2021 00:00:14 +0300 Message-Id: <20211011210016.135929-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011210016.135929-1-ilias.apalodimas@linaro.org> References: <20211011210016.135929-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 --- 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 Mon Oct 11 21:00:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 515627 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4821634ime; Mon, 11 Oct 2021 14:00:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYdZLEK0UXTdZjE+SUx2Pg7f2q/Op68HGnSBG2YfHEOh0O7U9Vix+k3BbxZiZogCi74tJE X-Received: by 2002:a05:6402:84d:: with SMTP id b13mr36323931edz.6.1633986055865; Mon, 11 Oct 2021 14:00:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633986055; cv=none; d=google.com; s=arc-20160816; b=N/WPqgaoRx3QQzwJlTUepiwcj3YBtxe8fNQr2o+gqGLNO+BYmI9H11Fxa2XqNgJv0G 8LOE3Zfi1CjToCAsvTNOkQgBjqfce6LSg3rawYgG80rT/YYdZU645/uVoBgGeDQCwJy7 38Z1GDACnkAf2DgMd3eHGWRQlpZgDNGQ+mEZLAtB+xoWXOJqTv7qHGj3RlFE+m/Fq13g l99STcgrUBJGx77jJsLKm7NRBC2GNCQ8enR56xlm4C0/8LIF5bukaIgZ5+wIBJ2qzl4n A+2pDjtJOhf7HcsJBBek0Jcv7NpE1bbxakZfMf1Qq3lz5YCW6W/1Vf9vR1xxPdSmbucf LpUA== 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=nF69qjWByErJTRu6ASaa+DFSl6BajrG85xomxo5LC2Y=; b=cIT3gNJK/Fr+273numhDZbJNygxOsR/tksuwFDqyUmk/9cSg+50yqSpuE28QX96A/c uh4ZNX8w1uWZ54dVZ5HITAqA5chAxWbJvcUacxmoP9i3riOZ/4cbeHSpkxgUdxne8epR 8b4jwdluZBdSn6NFM4JdFFlZD3/nznkKD5607WL3n+upFYblm/0w/kyuG/cHVZOS6j74 SRMDR1PkM+hCg1JJ4Faia6u3nvqUnFFD0EUfotsNlJz4q/MVnyT/IlFempab6OFQut9+ 6iiBR9V/Sx9AutCUdhS3ixAblKeGnyQ62QlufKByEK7ZyAtWl/KyRc3TYcuUsl0efJNH 0MZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xpDYtOwB; 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 c19si4865130ede.586.2021.10.11.14.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:55 -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=xpDYtOwB; 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 8F61883465; Mon, 11 Oct 2021 23:00:49 +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="xpDYtOwB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 357F083465; Mon, 11 Oct 2021 23:00:42 +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 CA045836FE for ; Mon, 11 Oct 2021 23:00:30 +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 w14so20792631edv.11 for ; Mon, 11 Oct 2021 14:00:30 -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=nF69qjWByErJTRu6ASaa+DFSl6BajrG85xomxo5LC2Y=; b=xpDYtOwBUrl5ivygS3upU1CbUIwdvXwMRUOJpTJmYfhSxTzAFiJs98+6CzKjPOw86k r89+NJVKgLCjRNiwU445LImy2qSSc8HngRamPUi1wS7JDUIcrEsHA6Oa7gzkW3isppi5 YCWZIK4zFjBx3TarUPvhXFDiLPUQNkftvDwXQcFThCDOpUssmlpLe0H7FZcVpVtZ+hnu ipnqun9s8btD8P++CGjA/BN2wUGUxOY/oksBFJOW6fBE5wz+Ht3hDttknto+Jnbd30ZN CyaeeSCVHh3LsOLsV0ec3zDiTMgi+NIcQ5x5WDIC++9ln0Y7wBBvKmWUVvuIaJ2W5auB jyTw== 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=nF69qjWByErJTRu6ASaa+DFSl6BajrG85xomxo5LC2Y=; b=nwFesH50pHvUf8K60MHNSziwhQUIm+o1P/JuKyA5cFHZOu88YGC0etIYbX3uuLHxey p5bmPGE/xHPVA9Xdqwrib1Pj+e57PbPlxM7irJB4p3WExn9K/D7E/BcGKVP/Fz6cDxp5 wnu7EFq6rV3fxGaR/cA/zuAuQIwj3AR/jb23OFbjzC9cYF0yAOFtTbrG2nUxv8yNKuE/ QOYx6mguVyefvXIQ7MdxbBbI4pKUfeqNMJWIc4G4Qx5vDfP+aUDDqTCzVh0i+HOMOInr FQ12eaOmSZR0PQo136Rd0cXYS6u9Din3mHtfis+zir9S0RGfAV054vdzt3RLFJ0dje2o hABw== X-Gm-Message-State: AOAM5301jW0nNGfo6ABk7cv1jZiEFwBaw4UVm943767dlqx/t3yqCkd8 eIwCQwkSRUTzsooc2yTkpQMLHQ== X-Received: by 2002:a17:906:2b82:: with SMTP id m2mr26805220ejg.122.1633986030369; Mon, 11 Oct 2021 14:00:30 -0700 (PDT) Received: from apalos.home ([2a02:587:468e:477f:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id h18sm3987233ejt.29.2021.10.11.14.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 14:00:30 -0700 (PDT) From: Ilias Apalodimas To: sjg@chromium.org Cc: Ilias Apalodimas , Bharat Gooty , Rayagonda Kokatanur , Rick Chen , Leo , Thomas Fitzsimmons , Bin Meng , Green Wan , =?utf-8?q?Marek_Beh=C3=BAn?= , Lukas Auer , Brad Kim , Heinrich Schuchardt , David Abdurachmanov , Dimitri John Ledkov , u-boot@lists.denx.de Subject: [PATCH 3/3] treewide: Remove OF_PRIOR_STAGE Date: Tue, 12 Oct 2021 00:00:15 +0300 Message-Id: <20211011210016.135929-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011210016.135929-1-ilias.apalodimas@linaro.org> References: <20211011210016.135929-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 --- 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) ----------------------------------------------------