board: sl28: add OP-TEE Trusted OS support (bl32)

Add support to load the OP-TEE Trusted OS by the SPL.

Signed-off-by: Michael Walle <michael@walle.cc>

diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
index 54ef0b4258dc4c6707e89bbd91d685f5a75fc3b0..65d5684973d85a8a5830142133d5de721beb7c99 100644 (file)
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
@@ -138,6 +138,42 @@
 };
 #endif
 
+#ifdef CONFIG_SL28_SPL_LOADS_OPTEE_BL32
+&binman {
+       fit {
+               images {
+                       bl32 {
+                               description = "OP-TEE Trusted OS (bl32)";
+                               type = "firmware";
+                               arch = "arm";
+                               os = "tee";
+                               compression = "none";
+                               load = <CONFIG_SL28_BL32_ENTRY_ADDR>;
+                               entry = <CONFIG_SL28_BL32_ENTRY_ADDR>;
+
+                               blob-ext {
+                                       filename = "tee.bin";
+                               };
+                       };
+               };
+
+               configurations {
+                       conf-1 {
+                               loadables = "uboot", "bl32";
+                       };
+
+                       conf-2 {
+                               loadables = "uboot", "bl32";
+                       };
+
+                       conf-3 {
+                               loadables = "uboot", "bl32";
+                       };
+               };
+       };
+};
+#endif
+
 &i2c0 {
        rtc: rtc@32 {
        };

diff --git a/board/kontron/sl28/Kconfig b/board/kontron/sl28/Kconfig
index aba49fc11586eed03eda6a8303816331b8019bb1..4078ef186b5313c69b33818887633f1f92f75507 100644 (file)
--- a/board/kontron/sl28/Kconfig
+++ b/board/kontron/sl28/Kconfig
@@ -25,4 +25,27 @@ config SL28_SPL_LOADS_ATF_BL31
          Enable this to load a BL31 image by the SPL. You have to
          provde a bl31.bin in u-boot's root directory.
 
+if SL28_SPL_LOADS_ATF_BL31
+
+config SL28_BL31_ENTRY_ADDR
+       hex "Entry point of the BL31 image"
+       default 0xfbe00000
+
+endif
+
+config SL28_SPL_LOADS_OPTEE_BL32
+       bool "SPL loads OP-TEE Trusted OS as BL32"
+       depends on SL28_SPL_LOADS_ATF_BL31
+       help
+         Enable this to load a BL32 image by the SPL. You have to
+         provde a tee.bin in u-boot's root directory.
+
+if SL28_SPL_LOADS_OPTEE_BL32
+
+config SL28_BL32_ENTRY_ADDR
+       hex "Entry point of the BL32 image"
+       default 0xfc000000
+
+endif
+
 endif

diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c
index b18127c4d18c596bfc103379a383ebe5eb6c5c7a..34f17b486bd4f2b5b61563ab4b787bf2465c290e 100644 (file)
--- a/board/kontron/sl28/sl28.c
+++ b/board/kontron/sl28/sl28.c
@@ -50,6 +50,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
        u64 base[CONFIG_NR_DRAM_BANKS];
        u64 size[CONFIG_NR_DRAM_BANKS];
        int nbanks = CONFIG_NR_DRAM_BANKS;
+       int node;
        int i;
 
        ft_cpu_setup(blob, bd);
@@ -64,5 +65,11 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 
        fdt_fixup_icid(blob);
 
+       if (CONFIG_IS_ENABLED(SL28_SPL_LOADS_OPTEE_BL32)) {
+               node = fdt_node_offset_by_compatible(blob, -1, "linaro,optee-tz");
+               if (node)
+                       fdt_set_node_status(blob, node, FDT_STATUS_OKAY, 0);
+       }
+
        return 0;
 }