diff mbox series

[v3,3/3] riscv: Enable CONFIG_OF_BOARD_FIXUP by default for OF_SEPARATE

Message ID 1593070646-6774-3-git-send-email-bmeng.cn@gmail.com
State Superseded
Headers show
Series [v3,1/3] riscv: Avoid the reserved memory fixup if src and dst point to the same place | expand

Commit Message

Bin Meng June 25, 2020, 7:37 a.m. UTC
From: Bin Meng <bin.meng at windriver.com>

Starting from OpenSBI v0.7, the SBI firmware inserts/fixes up the
reserved memory node for PMP protected memory regions. All RISC-V
boards needs to copy the reserved memory node from the device tree
provided by the firmware to the device tree used by U-Boot.

Turn on CONFIG_OF_BOARD_FIXUP by default for OF_SEPARATE.

Signed-off-by: Bin Meng <bin.meng at windriver.com>
---

Changes in v3:
- change to "default y if OF_SEPARATE"

 arch/riscv/Kconfig             | 3 +++
 configs/sifive_fu540_defconfig | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Atish Patra June 25, 2020, 6:48 p.m. UTC | #1
On Thu, Jun 25, 2020 at 12:38 AM Bin Meng <bmeng.cn at gmail.com> wrote:
>
> From: Bin Meng <bin.meng at windriver.com>
>
> Starting from OpenSBI v0.7, the SBI firmware inserts/fixes up the
> reserved memory node for PMP protected memory regions. All RISC-V
> boards needs to copy the reserved memory node from the device tree
nits:
/s/needs/need

> provided by the firmware to the device tree used by U-Boot.
>
> Turn on CONFIG_OF_BOARD_FIXUP by default for OF_SEPARATE.
>
> Signed-off-by: Bin Meng <bin.meng at windriver.com>
> ---
>
> Changes in v3:
> - change to "default y if OF_SEPARATE"
>
>  arch/riscv/Kconfig             | 3 +++
>  configs/sifive_fu540_defconfig | 1 -
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index d9854f5..ff8a9f8 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -273,4 +273,7 @@ config STACK_SIZE_SHIFT
>         int
>         default 14
>
> +config OF_BOARD_FIXUP
> +       default y if OF_SEPARATE
> +
>  endmenu
> diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
> index 8d412f8..32347c2 100644
> --- a/configs/sifive_fu540_defconfig
> +++ b/configs/sifive_fu540_defconfig
> @@ -16,7 +16,6 @@ CONFIG_DISPLAY_CPUINFO=y
>  CONFIG_DISPLAY_BOARDINFO=y
>  CONFIG_SPL_SEPARATE_BSS=y
>  CONFIG_SPL_YMODEM_SUPPORT=y
> -CONFIG_OF_BOARD_FIXUP=y
>  CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00"
>  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>  CONFIG_SPL_CLK=y
> --
> 2.7.4
>

Reviewed-by: Atish Patra <atish.patra at wdc.com>
diff mbox series

Patch

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index d9854f5..ff8a9f8 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -273,4 +273,7 @@  config STACK_SIZE_SHIFT
 	int
 	default 14
 
+config OF_BOARD_FIXUP
+	default y if OF_SEPARATE
+
 endmenu
diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
index 8d412f8..32347c2 100644
--- a/configs/sifive_fu540_defconfig
+++ b/configs/sifive_fu540_defconfig
@@ -16,7 +16,6 @@  CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_YMODEM_SUPPORT=y
-CONFIG_OF_BOARD_FIXUP=y
 CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_CLK=y