rockchip: Convert evb-rk3288 over to use binman

At present this board uses a custom script to produce the .its file.
Update it to use binman instead. Binman can create all the images that
are needed.

Signed-off-by: Simon Glass <[email protected]>

diff --git a/Kconfig b/Kconfig
index 92a8a69f730398e55d4f4aa1b21e1992119ebcc5..4462432956af66ba88f0b8e17f56ee00560099d3 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -321,7 +321,7 @@ config BUILD_TARGET
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
        default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
        default "u-boot-elf.srec" if RCAR_GEN3
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
        default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
        default "u-boot-elf.srec" if RCAR_GEN3

-       default "u-boot.itb" if SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
+       default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \

                                ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
        default "u-boot.kwb" if ARCH_KIRKWOOD
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
                                ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
        default "u-boot.kwb" if ARCH_KIRKWOOD
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT

diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi
index c87f00141f1e511295be9edaa655f18d6a54edd9..e3c6c10f130cb198d2ea770fc2531b56af35405f 100644 (file)
--- a/arch/arm/dts/rk3288-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-u-boot.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "rockchip-u-boot.dtsi"
  */
 
 #include "rockchip-u-boot.dtsi"

+#include "rockchip-optee.dtsi"

 
 / {
        chosen {
 
 / {
        chosen {

diff --git a/arch/arm/dts/rockchip-optee.dtsi b/arch/arm/dts/rockchip-optee.dtsi
new file mode 100644 (file)
index 0000000..cde9b81
--- /dev/null
+++ b/arch/arm/dts/rockchip-optee.dtsi
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2020 Google LLC
+ */
+
+#include <config.h>
+
+#if defined(CONFIG_HAS_ROM) && defined(CONFIG_FIT)
+&binman {
+       itb {
+               filename = "u-boot.itb";
+               fit {
+                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+                       description = "FIT image with OP-TEE support";
+                       #address-cells = <1>;
+
+                       images {
+                               uboot {
+                                       description = "U-Boot";
+                                       type = "standalone";
+                                       os = "U-Boot";
+                                       arch = "arm";
+                                       compression = "none";
+                                       load = <CONFIG_SYS_TEXT_BASE>;
+
+                                       u-boot-nodtb {
+                                       };
+                               };
+                               optee {
+                                       description = "OP-TEE";
+                                       type = "firmware";
+                                       arch = "arm";
+                                       os = "tee";
+                                       compression = "none";
+                                       load = <(CONFIG_SYS_SDRAM_BASE + 0x8400000)>;
+                                       entry = <(CONFIG_SYS_SDRAM_BASE + 0x8400000)>;
+
+                                       blob-ext {
+                                               filename = "tee.bin";
+                                       };
+                               };
+                               fdt {
+                                       description = CONFIG_SYS_BOARD;
+                                       type = "flat_dt";
+                                       compression = "none";
+
+                                       u-boot-dtb {
+                                       };
+                               };
+                       };
+
+                       configurations {
+                               default = "conf";
+                               conf {
+                                       description = CONFIG_SYS_BOARD;
+                                       firmware = "optee";
+                                       loadables = "uboot";
+                                       fdt = "fdt";
+                               };
+                       };
+               };
+       };
+};
+#endif

diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index bb715e9d0e6b31cb981c7b194f2a12bc943ff01d..20a00c5be78abcf64a91115ece179821c4374b89 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -48,6 +48,7 @@ config TARGET_CHROMEBOOK_SPEEDY
 
 config TARGET_EVB_RK3288
        bool "Evb-RK3288"
 
 config TARGET_EVB_RK3288
        bool "Evb-RK3288"

+       select HAS_ROM

        select BOARD_LATE_INIT
        select TPL
        help
        select BOARD_LATE_INIT
        select TPL
        help

diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index 6bdcc85eac712315835ae058f1b575b998d90c22..66bc387d8d3fb7e37ef32ad9f33cc6dcac7e4cc1 100644 (file)
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y

-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/fit_spl_optee.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set

 CONFIG_USE_PREBOOT=y
 CONFIG_SILENT_CONSOLE=y
 CONFIG_DEFAULT_FDT_FILE="rk3288-evb-rk808.dtb"
 CONFIG_USE_PREBOOT=y
 CONFIG_SILENT_CONSOLE=y
 CONFIG_DEFAULT_FDT_FILE="rk3288-evb-rk808.dtb"