binman: test: Move U-Boot variant test files to test/xpl/

Move about a dozen test files for U-Boot image variants (SPL, TPL,
VPL, DTB, nodtb, bss-pad) into an xpl/ subdirectory. Drop the
numeric prefixes and the redundant u_boot_ filename prefix, and
update all references.

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

13 files changed, 14 insertions, 14 deletions

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index bc6ebf8bcbf..7f02bffc0a9 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -1178,7 +1178,7 @@ class TestFunctional(unittest.TestCase):
 
     def testPackUbootDtb(self):
         """Test that a device tree can be added to U-Boot"""
-        data = self._DoReadFile('026_pack_u_boot_dtb.dts')
+        data = self._DoReadFile('xpl/pack_dtb.dts')
         self.assertEqual(U_BOOT_NODTB_DATA + U_BOOT_DTB_DATA, data)
 
     def testPackX86RomNoSize(self):
@@ -1362,7 +1362,7 @@ class TestFunctional(unittest.TestCase):
 
     def testUBootImg(self):
         """Test that u-boot.img can be put in a file"""
-        data = self._DoReadFile('036_u_boot_img.dts')
+        data = self._DoReadFile('xpl/u-boot-img.dts')
         self.assertEqual(U_BOOT_IMG_DATA, data)
 
     def testNoMicrocode(self):
@@ -1454,7 +1454,7 @@ class TestFunctional(unittest.TestCase):
         """Test that we can pad SPL's BSS with zeros"""
         # ELF file with a '__bss_size' symbol
         self._SetupSplElf()
-        data = self._DoReadFile('047_spl_bss_pad.dts')
+        data = self._DoReadFile('xpl/spl_bss_pad.dts')
         self.assertEqual(U_BOOT_SPL_DATA + tools.get_bytes(0, 10) + U_BOOT_DATA,
                          data)
 
@@ -1462,7 +1462,7 @@ class TestFunctional(unittest.TestCase):
         """Test that a missing symbol is detected"""
         self._SetupSplElf('u_boot_ucode_ptr')
         with self.assertRaises(ValueError) as e:
-            self._DoReadFile('047_spl_bss_pad.dts')
+            self._DoReadFile('xpl/spl_bss_pad.dts')
         self.assertIn('Expected __bss_size symbol in spl/u-boot-spl',
                       str(e.exception))
 
@@ -1514,13 +1514,13 @@ class TestFunctional(unittest.TestCase):
     def testSplDtb(self):
         """Test that an image with spl/u-boot-spl.dtb can be created"""
         self._SetupSplElf()
-        data = self._DoReadFile('051_u_boot_spl_dtb.dts')
+        data = self._DoReadFile('xpl/u-boot-spl-dtb.dts')
         self.assertEqual(U_BOOT_SPL_DTB_DATA, data[:len(U_BOOT_SPL_DTB_DATA)])
 
     def testSplNoDtb(self):
         """Test that an image with spl/u-boot-spl-nodtb.bin can be created"""
         self._SetupSplElf()
-        data = self._DoReadFile('052_u_boot_spl_nodtb.dts')
+        data = self._DoReadFile('xpl/u-boot-spl-nodtb.dts')
         self.assertEqual(U_BOOT_SPL_NODTB_DATA, data[:len(U_BOOT_SPL_NODTB_DATA)])
 
     def checkSymbols(self, dts, base_data, u_boot_offset, entry_args=None,
@@ -2031,7 +2031,7 @@ class TestFunctional(unittest.TestCase):
         """Test that an image with TPL and its device tree can be created"""
         # ELF file with a '__bss_size' symbol
         self._SetupTplElf()
-        data = self._DoReadFile('078_u_boot_tpl.dts')
+        data = self._DoReadFile('xpl/tpl.dts')
         self.assertEqual(U_BOOT_TPL_DATA + U_BOOT_TPL_DTB_DATA, data)
 
     def testUsesPos(self):
@@ -4807,7 +4807,7 @@ class TestFunctional(unittest.TestCase):
     def testTplNoDtb(self):
         """Test that an image with tpl/u-boot-tpl-nodtb.bin can be created"""
         self._SetupTplElf()
-        data = self._DoReadFile('192_u_boot_tpl_nodtb.dts')
+        data = self._DoReadFile('xpl/u-boot-tpl-nodtb.dts')
         self.assertEqual(U_BOOT_TPL_NODTB_DATA,
                          data[:len(U_BOOT_TPL_NODTB_DATA)])
 
@@ -4815,7 +4815,7 @@ class TestFunctional(unittest.TestCase):
         """Test that we can pad TPL's BSS with zeros"""
         # ELF file with a '__bss_size' symbol
         self._SetupTplElf()
-        data = self._DoReadFile('193_tpl_bss_pad.dts')
+        data = self._DoReadFile('xpl/tpl_bss_pad.dts')
         self.assertEqual(U_BOOT_TPL_DATA + tools.get_bytes(0, 10) + U_BOOT_DATA,
                          data)
 
@@ -4823,7 +4823,7 @@ class TestFunctional(unittest.TestCase):
         """Test that a missing symbol is detected"""
         self._SetupTplElf('u_boot_ucode_ptr')
         with self.assertRaises(ValueError) as e:
-            self._DoReadFile('193_tpl_bss_pad.dts')
+            self._DoReadFile('xpl/tpl_bss_pad.dts')
         self.assertIn('Expected __bss_size symbol in tpl/u-boot-tpl',
                       str(e.exception))
 
@@ -6336,13 +6336,13 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
         """Test that an image with VPL and its device tree can be created"""
         # ELF file with a '__bss_size' symbol
         self._SetupVplElf()
-        data = self._DoReadFile('255_u_boot_vpl.dts')
+        data = self._DoReadFile('xpl/vpl.dts')
         self.assertEqual(U_BOOT_VPL_DATA + U_BOOT_VPL_DTB_DATA, data)
 
     def testVplNoDtb(self):
         """Test that an image with vpl/u-boot-vpl-nodtb.bin can be created"""
         self._SetupVplElf()
-        data = self._DoReadFile('256_u_boot_vpl_nodtb.dts')
+        data = self._DoReadFile('xpl/u-boot-vpl-nodtb.dts')
         self.assertEqual(U_BOOT_VPL_NODTB_DATA,
                          data[:len(U_BOOT_VPL_NODTB_DATA)])
 
@@ -6374,7 +6374,7 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
         """Test that a missing symbol is detected"""
         self._SetupVplElf('u_boot_ucode_ptr')
         with self.assertRaises(ValueError) as e:
-            self._DoReadFile('258_vpl_bss_pad.dts')
+            self._DoReadFile('xpl/vpl_bss_pad.dts')
         self.assertIn('Expected __bss_size symbol in vpl/u-boot-vpl',
                       str(e.exception))
 
@@ -7028,7 +7028,7 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
             'spl-bss-pad': 'y',
             'spl-dtb': 'y',
         }
-        data = self._DoReadFileDtb('285_spl_expand.dts',
+        data = self._DoReadFileDtb('xpl/u-boot-spl.dts',
                                    use_expanded=True, entry_args=entry_args)[0]
 
     def testTemplate(self):
diff --git a/tools/binman/test/026_pack_u_boot_dtb.dts b/tools/binman/test/xpl/pack_dtb.dts
index 2707a7347a4..2707a7347a4 100644
--- a/tools/binman/test/026_pack_u_boot_dtb.dts
+++ b/tools/binman/test/xpl/pack_dtb.dts
diff --git a/tools/binman/test/047_spl_bss_pad.dts b/tools/binman/test/xpl/spl_bss_pad.dts
index 6bd88b83f98..6bd88b83f98 100644
--- a/tools/binman/test/047_spl_bss_pad.dts
+++ b/tools/binman/test/xpl/spl_bss_pad.dts
diff --git a/tools/binman/test/078_u_boot_tpl.dts b/tools/binman/test/xpl/tpl.dts
index 6c60b4c46f4..6c60b4c46f4 100644
--- a/tools/binman/test/078_u_boot_tpl.dts
+++ b/tools/binman/test/xpl/tpl.dts
diff --git a/tools/binman/test/193_tpl_bss_pad.dts b/tools/binman/test/xpl/tpl_bss_pad.dts
index f5c2db0646c..f5c2db0646c 100644
--- a/tools/binman/test/193_tpl_bss_pad.dts
+++ b/tools/binman/test/xpl/tpl_bss_pad.dts
diff --git a/tools/binman/test/036_u_boot_img.dts b/tools/binman/test/xpl/u-boot-img.dts
index aa5a3fe4810..aa5a3fe4810 100644
--- a/tools/binman/test/036_u_boot_img.dts
+++ b/tools/binman/test/xpl/u-boot-img.dts
diff --git a/tools/binman/test/051_u_boot_spl_dtb.dts b/tools/binman/test/xpl/u-boot-spl-dtb.dts
index 3912f86b4cd..3912f86b4cd 100644
--- a/tools/binman/test/051_u_boot_spl_dtb.dts
+++ b/tools/binman/test/xpl/u-boot-spl-dtb.dts
diff --git a/tools/binman/test/052_u_boot_spl_nodtb.dts b/tools/binman/test/xpl/u-boot-spl-nodtb.dts
index 7f4e27780fe..7f4e27780fe 100644
--- a/tools/binman/test/052_u_boot_spl_nodtb.dts
+++ b/tools/binman/test/xpl/u-boot-spl-nodtb.dts
diff --git a/tools/binman/test/285_spl_expand.dts b/tools/binman/test/xpl/u-boot-spl.dts
index 9c88ccb287b..9c88ccb287b 100644
--- a/tools/binman/test/285_spl_expand.dts
+++ b/tools/binman/test/xpl/u-boot-spl.dts
diff --git a/tools/binman/test/192_u_boot_tpl_nodtb.dts b/tools/binman/test/xpl/u-boot-tpl-nodtb.dts
index 94cef395e89..94cef395e89 100644
--- a/tools/binman/test/192_u_boot_tpl_nodtb.dts
+++ b/tools/binman/test/xpl/u-boot-tpl-nodtb.dts
diff --git a/tools/binman/test/256_u_boot_vpl_nodtb.dts b/tools/binman/test/xpl/u-boot-vpl-nodtb.dts
index 055016badd5..055016badd5 100644
--- a/tools/binman/test/256_u_boot_vpl_nodtb.dts
+++ b/tools/binman/test/xpl/u-boot-vpl-nodtb.dts
diff --git a/tools/binman/test/255_u_boot_vpl.dts b/tools/binman/test/xpl/vpl.dts
index a3a281a91e0..a3a281a91e0 100644
--- a/tools/binman/test/255_u_boot_vpl.dts
+++ b/tools/binman/test/xpl/vpl.dts
diff --git a/tools/binman/test/258_vpl_bss_pad.dts b/tools/binman/test/xpl/vpl_bss_pad.dts
index d308dcade17..d308dcade17 100644
--- a/tools/binman/test/258_vpl_bss_pad.dts
+++ b/tools/binman/test/xpl/vpl_bss_pad.dts