From: Simon Glass Date: Sat, 24 Aug 2019 13:22:57 +0000 (-0600) Subject: binman: Use the Makefile for u_boot_binman_syms_size X-Git-Tag: v2020.01-rc1~20^2~44 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e9d2ee3862488e98278a0201263c276c12729484;p=oweals%2Fu-boot.git 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 --- 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 Binary files a/tools/binman/test/u_boot_binman_syms_size and /dev/null differ