commit c9a0b27589a49d4beaaa4f75500597ab07cfff39
author Simon Glass <sjg@chromium.org> Sat Aug 24 07:22:59 2019 -0600
committer Simon Glass <sjg@chromium.org> Tue Oct 15 08:40:02 2019 -0600
tree 18f23df21b9ae82c9258806b066a8fb9efa230a0
parent 8dc60f99f9a2fe7873a753f1ab0254efd3cd6bd4

binman: Clean up unnecessary code related to ELF test files

We use the Makefile for all ELF test files now, so drop all the code that
checks whether to get the test file from the Makefile or from the git
repo.

Also add a comment to the Makefile indicating that it is run from binman.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/binman/elf_test.py

diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
index 1ee5d9d..f05545b 100644
--- a/tools/binman/elf_test.py
+++ b/tools/binman/elf_test.py
@@ -69,10 +69,7 @@
     if 'MAKEFLAGS' in os.environ:
         del os.environ['MAKEFLAGS']
     tools.Run('make', '-C', target_dir, '-f',
-              os.path.join(testdir, 'Makefile'), 'SRC=%s/' % testdir,
-              'bss_data', 'u_boot_ucode_ptr', 'u_boot_no_ucode_ptr',
-              'u_boot_binman_syms', 'u_boot_binman_syms.bin',
-              'u_boot_binman_syms_size', 'u_boot_binman_syms_bad')
+              os.path.join(testdir, 'Makefile'), 'SRC=%s/' % testdir)
 
 
 class TestElf(unittest.TestCase):

tools/binman/ftest.py

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 51eab6f..1d774e2 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -488,13 +488,8 @@
         Args:
             Filename of ELF file to use as SPL
         """
-        # TODO(sjg@chromium.org): Drop this when all Elf files use ElfTestFile()
-        if src_fname in ['bss_data', 'u_boot_ucode_ptr', 'u_boot_no_ucode_ptr',
-                         'u_boot_binman_syms', 'u_boot_binman_syms_size']:
-            fname = cls.ElfTestFile(src_fname)
-        else:
-            fname = cls.TestFile(src_fname)
-        TestFunctional._MakeInputFile('spl/u-boot-spl', tools.ReadFile(fname))
+        TestFunctional._MakeInputFile('spl/u-boot-spl',
+            tools.ReadFile(cls.ElfTestFile(src_fname)))
 
     @classmethod
     def TestFile(cls, fname):

tools/binman/test/Makefile

diff --git a/tools/binman/test/Makefile b/tools/binman/test/Makefile
index 593bbe9..bdbb009 100644
--- a/tools/binman/test/Makefile
+++ b/tools/binman/test/Makefile
@@ -1,5 +1,5 @@
 #
-# Builds test programs
+# Builds test programs. This is launched from elf_test.BuildElfTestFiles()
 #
 # Copyright (C) 2017 Google, Inc
 # Written by Simon Glass <sjg@chromium.org>