riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb

At present SiFive Unleashed board uses the Makefile to create the FIT,
using USE_SPL_FIT_GENERATOR, which is deprecated as per the Makefile
warning. Update to use binman instead.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi
new file mode 100644 (file)
index 0000000..e02597e
--- /dev/null
+++ b/arch/riscv/dts/binman.dtsi
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2021, Bin Meng <bmeng.cn@gmail.com>
+ */
+
+#include <config.h>
+
+/ {
+       binman: binman {
+               multiple-images;
+       };
+};
+
+&binman {
+       itb {
+               filename = "u-boot.itb";
+
+               fit {
+                       description = "Configuration to load OpenSBI before U-Boot";
+                       #address-cells = <1>;
+                       fit,fdt-list = "of-list";
+
+                       images {
+                               uboot {
+                                       description = "U-Boot";
+                                       type = "standalone";
+                                       os = "U-Boot";
+                                       arch = "riscv";
+                                       compression = "none";
+                                       load = <CONFIG_SYS_TEXT_BASE>;
+
+                                       uboot_blob: blob-ext {
+                                               filename = "u-boot-nodtb.bin";
+                                       };
+                               };
+
+                               opensbi {
+                                       description = "OpenSBI fw_dynamic Firmware";
+                                       type = "firmware";
+                                       os = "opensbi";
+                                       arch = "riscv";
+                                       compression = "none";
+                                       load = <CONFIG_SPL_OPENSBI_LOAD_ADDR>;
+                                       entry = <CONFIG_SPL_OPENSBI_LOAD_ADDR>;
+
+                                       opensbi_blob: opensbi {
+                                               filename = "fw_dynamic.bin";
+                                       };
+                               };
+
+                               @fdt-SEQ {
+                                       description = "NAME";
+                                       type = "flat_dt";
+                                       compression = "none";
+                               };
+                       };
+
+                       configurations {
+                               default = "conf-1";
+
+                               @conf-SEQ {
+                                       description = "NAME";
+                                       firmware = "opensbi";
+                                       loadables = "uboot";
+                                       fdt = "fdt-SEQ";
+                               };
+                       };
+               };
+       };
+};

diff --git a/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi b/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
index 1996149c95a8fb69d5b4194872d8d1b753ed65c4..51b566116d3574511117376c7038cf9b1a2401b1 100644 (file)
--- a/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
+++ b/arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
@@ -3,6 +3,7 @@
  * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
  */
 
+#include "binman.dtsi"
 #include "fu540-c000-u-boot.dtsi"
 #include "fu540-hifive-unleashed-a00-ddr.dtsi"
 

diff --git a/board/sifive/unleashed/Kconfig b/board/sifive/unleashed/Kconfig
index dbffd59c98ed1bc57ff5152eb7de0af0eb2fb196..502916e86a854d51903eb20080e26a40417f0a76 100644 (file)
--- a/board/sifive/unleashed/Kconfig
+++ b/board/sifive/unleashed/Kconfig
@@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select SIFIVE_FU540
        select ENV_IS_IN_SPI_FLASH
+       select BINMAN
        imply CMD_DHCP
        imply CMD_EXT2
        imply CMD_EXT4

diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig
index 62416a7c1d83f8eb60f16232854e8ef5d933fa44..dc9313e572d8f1b84071dd61893e152af96e8b7d 100644 (file)
--- a/configs/sifive_unleashed_defconfig
+++ b/configs/sifive_unleashed_defconfig
@@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_MISC_INIT_R=y