dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

binman: Use the Makefile for u_boot_no_ucode_ptr

Browse Source 
Remove this file from git and instead build it using the Makefile.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2019-08-24 07:22:55 -06:00
parent f514d8f23d
commit bccd91da9b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/binman/elf_test.py
View File

@@ -70,7 +70,7 @@ def BuildElfTestFiles(target_dir):
del os.environ['MAKEFLAGS'] del os.environ['MAKEFLAGS']
tools.Run('make', '-C', target_dir, '-f', tools.Run('make', '-C', target_dir, '-f',
os.path.join(testdir, 'Makefile'), 'SRC=%s/' % testdir, os.path.join(testdir, 'Makefile'), 'SRC=%s/' % testdir,
'bss_data', 'u_boot_ucode_ptr') 'bss_data', 'u_boot_ucode_ptr', 'u_boot_no_ucode_ptr')
class TestElf(unittest.TestCase): class TestElf(unittest.TestCase):

10
tools/binman/ftest.py
View File

@@ -489,7 +489,7 @@ class TestFunctional(unittest.TestCase):
Filename of ELF file to use as SPL Filename of ELF file to use as SPL
""" """
# TODO(sjg@chromium.org): Drop this when all Elf files use ElfTestFile() # TODO(sjg@chromium.org): Drop this when all Elf files use ElfTestFile()
if src_fname in ['bss_data', 'u_boot_ucode_ptr']: if src_fname in ['bss_data', 'u_boot_ucode_ptr', 'u_boot_no_ucode_ptr']:
fname = cls.ElfTestFile(src_fname) fname = cls.ElfTestFile(src_fname)
else: else:
fname = cls.TestFile(src_fname) fname = cls.TestFile(src_fname)
@@ -1091,8 +1091,8 @@ class TestFunctional(unittest.TestCase):
"""Test that a U-Boot binary without the microcode symbol is detected""" """Test that a U-Boot binary without the microcode symbol is detected"""
# ELF file without a '_dt_ucode_base_size' symbol # ELF file without a '_dt_ucode_base_size' symbol
try: try:
with open(self.TestFile('u_boot_no_ucode_ptr'), 'rb') as fd: TestFunctional._MakeInputFile('u-boot',
TestFunctional._MakeInputFile('u-boot', fd.read()) tools.ReadFile(self.ElfTestFile('u_boot_no_ucode_ptr')))
with self.assertRaises(ValueError) as e: with self.assertRaises(ValueError) as e:
self._RunPackUbootSingleMicrocode() self._RunPackUbootSingleMicrocode()
@@ -1114,8 +1114,8 @@ class TestFunctional(unittest.TestCase):
def testWithoutMicrocode(self): def testWithoutMicrocode(self):
"""Test that we can cope with an image without microcode (e.g. qemu)""" """Test that we can cope with an image without microcode (e.g. qemu)"""
with open(self.TestFile('u_boot_no_ucode_ptr'), 'rb') as fd: TestFunctional._MakeInputFile('u-boot',
TestFunctional._MakeInputFile('u-boot', fd.read()) tools.ReadFile(self.ElfTestFile('u_boot_no_ucode_ptr')))
data, dtb, _, _ = self._DoReadFileDtb('044_x86_optional_ucode.dts', True) data, dtb, _, _ = self._DoReadFileDtb('044_x86_optional_ucode.dts', True)
# Now check the device tree has no microcode # Now check the device tree has no microcode

BIN
tools/binman/test/u_boot_no_ucode_ptr
View File

Binary file not shown.