Revert "binman: Add support for a rockchip-tpl entry"

This reverts commit 05b978be5f5c5494044bd749f9b6b38f2bb5e0cc.

Bug: 280449250
Change-Id: Ieb7420f5b131fe49fecc1f50e771786d5080697b
Signed-off-by: Ram Muthiah <rammuthiah@google.com>

5 files changed, 0 insertions, 62 deletions

diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst
index e177860a6a8..7a04a613992 100644
--- a/tools/binman/entries.rst
+++ b/tools/binman/entries.rst
@@ -1386,20 +1386,6 @@ For example, this creates an image with a pre-load header and a binary::
 
 
 
-.. _etype_rockchip_tpl:
-
-Entry: rockchip-tpl: Rockchip TPL binary
-----------------------------------------
-
-Properties / Entry arguments:
-    - rockchip-tpl-path: Filename of file to read into the entry,
-                         typically <soc>_ddr_<version>.bin
-
-This entry holds an external TPL binary used by some Rockchip SoCs
-instead of normal U-Boot TPL, typically to initialize DRAM.
-
-
-
 .. _etype_scp:
 
 Entry: scp: System Control Processor (SCP) firmware blob
diff --git a/tools/binman/etype/rockchip_tpl.py b/tools/binman/etype/rockchip_tpl.py
deleted file mode 100644
index 74f58ba8570..00000000000
--- a/tools/binman/etype/rockchip_tpl.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Entry-type module for Rockchip TPL binary
-#
-
-from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg
-
-class Entry_rockchip_tpl(Entry_blob_named_by_arg):
-    """Rockchip TPL binary
-
-    Properties / Entry arguments:
-        - rockchip-tpl-path: Filename of file to read into the entry,
-                             typically <soc>_ddr_<version>.bin
-
-    This entry holds an external TPL binary used by some Rockchip SoCs
-    instead of normal U-Boot TPL, typically to initialize DRAM.
-    """
-    def __init__(self, section, etype, node):
-        super().__init__(section, etype, node, 'rockchip-tpl')
-        self.external = True
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 48ac1540bfd..062f54adb0e 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -90,7 +90,6 @@ TEE_OS_DATA           = b'this is some tee OS data'
 ATF_BL2U_DATA         = b'bl2u'
 OPENSBI_DATA          = b'opensbi'
 SCP_DATA              = b'scp'
-ROCKCHIP_TPL_DATA     = b'rockchip-tpl'
 TEST_FDT1_DATA        = b'fdt1'
 TEST_FDT2_DATA        = b'test-fdt2'
 ENV_DATA              = b'var1=1\nvar2="2"'
@@ -206,7 +205,6 @@ class TestFunctional(unittest.TestCase):
         TestFunctional._MakeInputFile('bl2u.bin', ATF_BL2U_DATA)
         TestFunctional._MakeInputFile('fw_dynamic.bin', OPENSBI_DATA)
         TestFunctional._MakeInputFile('scp.bin', SCP_DATA)
-        TestFunctional._MakeInputFile('rockchip-tpl.bin', ROCKCHIP_TPL_DATA)
 
         # Add a few .dtb files for testing
         TestFunctional._MakeInputFile('%s/test-fdt1.dtb' % TEST_FDT_SUBDIR,
@@ -6388,11 +6386,6 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
         self.assertEqual(['u-boot', 'atf-2'],
                          fdt_util.GetStringList(node, 'loadables'))
 
-    def testPackRockchipTpl(self):
-        """Test that an image with a Rockchip TPL binary can be created"""
-        data = self._DoReadFile('277_rockchip_tpl.dts')
-        self.assertEqual(ROCKCHIP_TPL_DATA, data[:len(ROCKCHIP_TPL_DATA)])
-
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tools/binman/missing-blob-help b/tools/binman/missing-blob-help
index f3a44d08acc..4448ac93112 100644
--- a/tools/binman/missing-blob-help
+++ b/tools/binman/missing-blob-help
@@ -34,11 +34,6 @@ If CONFIG_WDT_K3_RTI_LOAD_FW is enabled, a firmware image is needed for
 the R5F core(s) to trigger the system reset. One possible source is
 https://github.com/siemens/k3-rti-wdt.
 
-rockchip-tpl:
-An external TPL is required to initialize DRAM. Get the external TPL
-binary and build with ROCKCHIP_TPL=/path/to/ddr.bin. One possible source
-for the external TPL binary is https://github.com/rockchip-linux/rkbin.
-
 tee-os:
 See the documentation for your board. You may need to build Open Portable
 Trusted Execution Environment (OP-TEE) with TEE=/path/to/tee.bin
diff --git a/tools/binman/test/277_rockchip_tpl.dts b/tools/binman/test/277_rockchip_tpl.dts
deleted file mode 100644
index 269f56e2545..00000000000
--- a/tools/binman/test/277_rockchip_tpl.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-/dts-v1/;
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	binman {
-		size = <16>;
-
-		rockchip-tpl {
-			filename = "rockchip-tpl.bin";
-		};
-	};
-};