summaryrefslogtreecommitdiff
path: root/tools/binman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-08-24 16:22:57 +0300
committerSimon Glass <sjg@chromium.org>2019-10-15 17:40:02 +0300
commite9d2ee3862488e98278a0201263c276c12729484 (patch)
treed9894031384ab206299f08e0cfda7d437726b7c8 /tools/binman
parent1542c8b5fce0f81ace585ac87218bfd79eb077f3 (diff)
downloadu-boot-e9d2ee3862488e98278a0201263c276c12729484.tar.xz
binman: Use the Makefile for u_boot_binman_syms_size
Remove this file from git and instead build it using the Makefile. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
-rw-r--r--tools/binman/elf_test.py5
-rw-r--r--tools/binman/ftest.py2
-rwxr-xr-xtools/binman/test/u_boot_binman_syms_sizebin4825 -> 0 bytes
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
index ff036cb655..a913970150 100644
--- a/tools/binman/elf_test.py
+++ b/tools/binman/elf_test.py
@@ -71,7 +71,8 @@ def BuildElfTestFiles(target_dir):
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', 'u_boot_binman_syms.bin',
+ 'u_boot_binman_syms_size')
class TestElf(unittest.TestCase):
@@ -145,7 +146,7 @@ class TestElf(unittest.TestCase):
"""
entry = FakeEntry(10)
section = FakeSection()
- elf_fname = os.path.join(binman_dir, 'test', 'u_boot_binman_syms_size')
+ elf_fname =self.ElfTestFile('u_boot_binman_syms_size')
with self.assertRaises(ValueError) as e:
syms = elf.LookupAndWriteSymbols(elf_fname, entry, section)
self.assertIn('has size 1: only 4 and 8 are supported',
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 507c481881..51eab6fbfa 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -490,7 +490,7 @@ class TestFunctional(unittest.TestCase):
"""
# 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', 'u_boot_binman_syms_size']:
fname = cls.ElfTestFile(src_fname)
else:
fname = cls.TestFile(src_fname)
diff --git a/tools/binman/test/u_boot_binman_syms_size b/tools/binman/test/u_boot_binman_syms_size
deleted file mode 100755
index d691e897c0..0000000000
--- a/tools/binman/test/u_boot_binman_syms_size
+++ /dev/null
Binary files differ