summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-08-24 07:22:58 -0600
committerSimon Glass <sjg@chromium.org>2019-10-15 08:40:02 -0600
commit8dc60f99f9a2fe7873a753f1ab0254efd3cd6bd4 (patch)
treeeed0ebd5763a9d7bbfeedeeb283b4eb36f97c112
parente9d2ee3862488e98278a0201263c276c12729484 (diff)
binman: Use the Makefile for u_boot_binman_syms_bad
Remove this file from git and instead build it using the Makefile. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--tools/binman/elf_test.py4
-rw-r--r--tools/binman/test/Makefile2
-rwxr-xr-xtools/binman/test/u_boot_binman_syms_badbin4890 -> 0 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
index a913970150..1ee5d9d57c 100644
--- a/tools/binman/elf_test.py
+++ b/tools/binman/elf_test.py
@@ -72,7 +72,7 @@ def BuildElfTestFiles(target_dir):
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_size', 'u_boot_binman_syms_bad')
class TestElf(unittest.TestCase):
@@ -134,7 +134,7 @@ class TestElf(unittest.TestCase):
"""
entry = FakeEntry(10)
section = FakeSection()
- elf_fname = os.path.join(binman_dir, 'test', 'u_boot_binman_syms_bad')
+ elf_fname = self.ElfTestFile('u_boot_binman_syms_bad')
self.assertEqual(elf.LookupAndWriteSymbols(elf_fname, entry, section),
None)
diff --git a/tools/binman/test/Makefile b/tools/binman/test/Makefile
index 7af5459793..593bbe9bd9 100644
--- a/tools/binman/test/Makefile
+++ b/tools/binman/test/Makefile
@@ -13,7 +13,7 @@ CFLAGS := -march=i386 -m32 -nostdlib -I $(SRC)../../../include \
LDS_UCODE := -T $(SRC)u_boot_ucode_ptr.lds
LDS_BINMAN := -T $(SRC)u_boot_binman_syms.lds
-LDS_BINMAN_BAD := -T u_boot_binman_syms_bad.lds
+LDS_BINMAN_BAD := -T $(SRC)u_boot_binman_syms_bad.lds
TARGETS = u_boot_ucode_ptr u_boot_no_ucode_ptr bss_data \
u_boot_binman_syms u_boot_binman_syms.bin u_boot_binman_syms_bad \
diff --git a/tools/binman/test/u_boot_binman_syms_bad b/tools/binman/test/u_boot_binman_syms_bad
deleted file mode 100755
index 8da3d9d48f..0000000000
--- a/tools/binman/test/u_boot_binman_syms_bad
+++ /dev/null
Binary files differ