summaryrefslogtreecommitdiff
path: root/tools/binman/ftest.py
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-08-24 07:22:59 -0600
committerSimon Glass <sjg@chromium.org>2019-10-15 08:40:02 -0600
commitc9a0b27589a49d4beaaa4f75500597ab07cfff39 (patch)
tree18f23df21b9ae82c9258806b066a8fb9efa230a0 /tools/binman/ftest.py
parent8dc60f99f9a2fe7873a753f1ab0254efd3cd6bd4 (diff)
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>
Diffstat (limited to 'tools/binman/ftest.py')
-rw-r--r--tools/binman/ftest.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 51eab6fbfad..1d774e28e54 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -488,13 +488,8 @@ class TestFunctional(unittest.TestCase):
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):