binman: Add support for TEE BL32

Add an entry for OP-TEE Trusted OS 'BL32' payload.
This is required by platforms using Cortex-A cores with TrustZone
technology.

Signed-off-by: Roger Quadros <rogerq@kernel.org>

4 files changed, 58 insertions, 0 deletions

diff --git a/tools/binman/README.entries b/tools/binman/README.entries
index 999b77690f..fbf1ab8ef5 100644
--- a/tools/binman/README.entries
+++ b/tools/binman/README.entries
@@ -25,6 +25,19 @@ about ATF.
 
 
 
+Entry: atf-bl32: Entry containing an OP-TEE Trusted OS (TEE) BL32 blob
+-------------------------------------------------------------------------
+
+Properties / Entry arguments:
+    - atf-bl32-path: Filename of file to read into entry. This is typically
+        called bl32.bin or bl32.elf
+
+This entry holds the run-time firmware, typically started by U-Boot SPL.
+See the U-Boot README for your architecture or board for how to use it. See
+https://github.com/OP-TEE/optee_os for more information about OP-TEE.
+
+
+
 Entry: blob: Entry containing an arbitrary binary blob
 ------------------------------------------------------
 
diff --git a/tools/binman/etype/atf_bl32.py b/tools/binman/etype/atf_bl32.py
new file mode 100644
index 0000000000..e74b4e4428
--- /dev/null
+++ b/tools/binman/etype/atf_bl32.py
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/
+#
+# Entry-type module for OP-TEE Trusted OS firmware blob
+#
+
+from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg
+
+class Entry_atf_bl32(Entry_blob_named_by_arg):
+    """Entry containing an OP-TEE Trusted OS (TEE) BL32 blob
+
+    Properties / Entry arguments:
+        - atf-bl32-path: Filename of file to read into entry. This is typically
+            called bl32.bin or bl32.elf
+
+    This entry holds the run-time firmware, typically started by U-Boot SPL.
+    See the U-Boot README for your architecture or board for how to use it. See
+    https://github.com/OP-TEE/optee_os for more information about OP-TEE.
+    """
+    def __init__(self, section, etype, node):
+        super().__init__(section, etype, node, 'atf-bl32')
+        self.external = True
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index e753a342c8..ccbaf39cbf 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -76,6 +76,7 @@ FSP_M_DATA            = b'fsp_m'
 FSP_S_DATA            = b'fsp_s'
 FSP_T_DATA            = b'fsp_t'
 ATF_BL31_DATA         = b'bl31'
+ATF_BL32_DATA         = b'bl32'
 SCP_DATA              = b'scp'
 TEST_FDT1_DATA        = b'fdt1'
 TEST_FDT2_DATA        = b'test-fdt2'
@@ -178,6 +179,7 @@ class TestFunctional(unittest.TestCase):
         TestFunctional._MakeInputFile('compress', COMPRESS_DATA)
         TestFunctional._MakeInputFile('compress_big', COMPRESS_DATA_BIG)
         TestFunctional._MakeInputFile('bl31.bin', ATF_BL31_DATA)
+        TestFunctional._MakeInputFile('bl32.bin', ATF_BL32_DATA)
         TestFunctional._MakeInputFile('scp.bin', SCP_DATA)
 
         # Add a few .dtb files for testing
@@ -3672,6 +3674,11 @@ class TestFunctional(unittest.TestCase):
         data = self._DoReadFile('169_atf_bl31.dts')
         self.assertEqual(ATF_BL31_DATA, data[:len(ATF_BL31_DATA)])
 
+    def testPackBl32(self):
+        """Test that an image with an ATF BL32 binary can be created"""
+        data = self._DoReadFile('170_atf_bl32.dts')
+        self.assertEqual(ATF_BL32_DATA, data[:len(ATF_BL32_DATA)])
+
     def testPackScp(self):
         """Test that an image with an SCP binary can be created"""
         data = self._DoReadFile('172_scp.dts')
diff --git a/tools/binman/test/170_atf_bl32.dts b/tools/binman/test/170_atf_bl32.dts
new file mode 100644
index 0000000000..8c15c79c86
--- /dev/null
+++ b/tools/binman/test/170_atf_bl32.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	binman {
+		size = <16>;
+
+		atf-bl32 {
+			filename = "bl32.bin";
+		};
+	};
+};