From ec9e0f471291233491d1bd213d32bb259821da95 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:33 -0600 Subject: patman: Handle unicode in _ProjectConfigParser tests With Python 2.7.15rc1, ConfigParser.SafeConfigParser has unfortunately started returning unicode, for unknown reasons. Adjust the code to handle this by converting everything to unicode. We cannot convert things to ASCII since email addresses may be encoded with UTF-8. Signed-off-by: Simon Glass --- tools/patman/settings.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/patman/settings.py b/tools/patman/settings.py index ca4334426ba..ea2bc74f759 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -58,25 +58,25 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser): >>> config = _ProjectConfigParser("zzz") >>> config.readfp(StringIO(sample_config)) >>> config.get("alias", "enemies") - 'Evil ' + u'Evil ' # Check to make sure that alias gets overridden by project. >>> config = _ProjectConfigParser("sm") >>> config.readfp(StringIO(sample_config)) >>> config.get("alias", "enemies") - 'Green G. ' + u'Green G. ' # Check to make sure that settings get merged with project. >>> config = _ProjectConfigParser("linux") >>> config.readfp(StringIO(sample_config)) >>> sorted(config.items("settings")) - [('am_hero', 'True'), ('process_tags', 'False')] + [(u'am_hero', u'True'), (u'process_tags', u'False')] # Check to make sure that settings works with unknown project. >>> config = _ProjectConfigParser("unknown") >>> config.readfp(StringIO(sample_config)) >>> sorted(config.items("settings")) - [('am_hero', 'True')] + [(u'am_hero', u'True')] """ def __init__(self, project_name): """Construct _ProjectConfigParser. @@ -99,6 +99,17 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser): for setting_name, setting_value in project_defaults.items(): self.set(project_settings, setting_name, setting_value) + def _to_unicode(self, val): + """Make sure a value is of type 'unicode' + + Args: + val: string or unicode object + + Returns: + unicode version of val + """ + return val if isinstance(val, unicode) else val.decode('utf-8') + def get(self, section, option, *args, **kwargs): """Extend SafeConfigParser to try project_section before section. @@ -108,14 +119,15 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser): See SafeConfigParser. """ try: - return ConfigParser.SafeConfigParser.get( + val = ConfigParser.SafeConfigParser.get( self, "%s_%s" % (self._project_name, section), option, *args, **kwargs ) except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): - return ConfigParser.SafeConfigParser.get( + val = ConfigParser.SafeConfigParser.get( self, section, option, *args, **kwargs ) + return self._to_unicode(val) def items(self, section, *args, **kwargs): """Extend SafeConfigParser to add project_section to section. @@ -150,7 +162,8 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser): item_dict = dict(top_items) item_dict.update(project_items) - return item_dict.items() + return {(self._to_unicode(item), self._to_unicode(val)) + for item, val in item_dict.iteritems()} def ReadGitAliases(fname): """Read a git alias file. This is in the form used by git: -- cgit v1.3.1 From da753e35cbd9a7fdad2e9be13a9642fb1d9af968 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:35 -0600 Subject: buildman: Make the toolchain test more forgiving The filenames of the toolchains on kernel.org changes every now and then. Fix it for the current change, and make the test use a regex so that it has a better chance of passing with future changes too. Signed-off-by: Simon Glass --- tools/buildman/test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/buildman/test.py b/tools/buildman/test.py index c36bcdf6fb7..7259f7b6507 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -422,8 +422,10 @@ class TestBuild(unittest.TestCase): def testToolchainDownload(self): """Test that we can download toolchains""" if use_network: - self.assertEqual('https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/x86_64-gcc-4.9.0-nolibc_arm-unknown-linux-gnueabi.tar.xz', - self.toolchains.LocateArchUrl('arm')) + url = self.toolchains.LocateArchUrl('arm') + self.assertRegexpMatches(url, 'https://www.kernel.org/pub/tools/' + 'crosstool/files/bin/x86_64/.*/' + 'x86_64-gcc-.*-nolibc_arm-.*linux-gnueabi.tar.xz') if __name__ == "__main__": -- cgit v1.3.1 From ed59e005e6ed388609749d52e98804b76db095d1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:40 -0600 Subject: binman: Add a default path to libfdt.py This module is often available in the sandbox_spl build created by 'make check'. Use this as a default path so that just typing 'binman -t' (without setting PYTHONPATH) will generally run the tests. Signed-off-by: Simon Glass --- tools/binman/binman.py | 2 ++ tools/dtoc/dtoc.py | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'tools') diff --git a/tools/binman/binman.py b/tools/binman/binman.py index 1536e956517..f5af5359f3c 100755 --- a/tools/binman/binman.py +++ b/tools/binman/binman.py @@ -22,6 +22,8 @@ for dirname in ['../patman', '../dtoc', '..']: # Bring in the libfdt module sys.path.insert(0, 'scripts/dtc/pylibfdt') +sys.path.insert(0, os.path.join(our_path, + '../../build-sandbox_spl/scripts/dtc/pylibfdt')) import cmdline import command diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py index 827094e72ab..33b2589c561 100755 --- a/tools/dtoc/dtoc.py +++ b/tools/dtoc/dtoc.py @@ -34,6 +34,11 @@ import unittest our_path = os.path.dirname(os.path.realpath(__file__)) sys.path.append(os.path.join(our_path, '../patman')) +# Bring in the libfdt module +sys.path.insert(0, 'scripts/dtc/pylibfdt') +sys.path.insert(0, os.path.join(our_path, + '../../build-sandbox_spl/scripts/dtc/pylibfdt')) + import dtb_platdata import test_util -- cgit v1.3.1 From e0e6275f4c6cbcf2b975dbd9771b14f21eb51a36 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:41 -0600 Subject: binman: Fix up removal of temporary directories At present 'make check' leaves some temporary directories around. Part of this is because we call tools.PrepareOutputDir() twice in some cases, without calling tools.FinaliseOutputDir() in between. Fix this. Signed-off-by: Simon Glass --- tools/binman/elf_test.py | 5 +++++ tools/binman/entry_test.py | 8 ++++++-- tools/binman/fdt_test.py | 4 ++++ tools/binman/ftest.py | 8 +++----- tools/dtoc/test_fdt.py | 10 +++++++--- 5 files changed, 25 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index c16f71401d1..b68530c19ba 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -10,6 +10,7 @@ import unittest import elf import test_util +import tools binman_dir = os.path.dirname(os.path.realpath(sys.argv[0])) @@ -46,6 +47,10 @@ class FakeSection: class TestElf(unittest.TestCase): + @classmethod + def setUpClass(self): + tools.SetInputDirs(['.']) + def testAllSymbols(self): """Test that we can obtain a symbol from the ELF file""" fname = os.path.join(binman_dir, 'test', 'u_boot_ucode_ptr') diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index 69d85b4cedb..a8bc938f9e9 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -14,9 +14,14 @@ import fdt_util import tools class TestEntry(unittest.TestCase): + def setUp(self): + tools.PrepareOutputDir(None) + + def tearDown(self): + tools.FinaliseOutputDir() + def GetNode(self): binman_dir = os.path.dirname(os.path.realpath(sys.argv[0])) - tools.PrepareOutputDir(None) fname = fdt_util.EnsureCompiled( os.path.join(binman_dir,('test/05_simple.dts'))) dtb = fdt.FdtScan(fname) @@ -35,7 +40,6 @@ class TestEntry(unittest.TestCase): global entry reload(entry) entry.Entry.Create(None, self.GetNode(), 'u-boot-spl') - tools._RemoveOutputDir() del entry def testEntryContents(self): diff --git a/tools/binman/fdt_test.py b/tools/binman/fdt_test.py index 8ea098f38ae..b9167012d25 100644 --- a/tools/binman/fdt_test.py +++ b/tools/binman/fdt_test.py @@ -21,6 +21,10 @@ class TestFdt(unittest.TestCase): self._indir = tempfile.mkdtemp(prefix='binmant.') tools.PrepareOutputDir(self._indir, True) + @classmethod + def tearDownClass(self): + tools._FinaliseForTest() + def TestFile(self, fname): return os.path.join(self._binman_dir, 'test', fname) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 57725c928e7..9ef259a699b 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -115,7 +115,6 @@ class TestFunctional(unittest.TestCase): TestFunctional._MakeInputFile('ecrw.bin', CROS_EC_RW_DATA) TestFunctional._MakeInputDir('devkeys') TestFunctional._MakeInputFile('bmpblk.bin', BMPBLK_DATA) - self._output_setup = False # ELF file with a '_dt_ucode_base_size' symbol with open(self.TestFile('u_boot_ucode_ptr')) as fd: @@ -230,14 +229,13 @@ class TestFunctional(unittest.TestCase): Returns: Contents of device-tree binary """ - if not self._output_setup: - tools.PrepareOutputDir(self._indir, True) - self._output_setup = True + tools.PrepareOutputDir(None) dtb = fdt_util.EnsureCompiled(self.TestFile(fname)) with open(dtb) as fd: data = fd.read() TestFunctional._MakeInputFile(outfile, data) - return data + tools.FinaliseOutputDir() + return data def _GetDtbContentsForSplTpl(self, dtb_data, name): """Create a version of the main DTB for SPL or SPL diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py index d2597020500..2e6febe8f38 100755 --- a/tools/dtoc/test_fdt.py +++ b/tools/dtoc/test_fdt.py @@ -60,7 +60,7 @@ class TestFdt(unittest.TestCase): @classmethod def tearDownClass(cls): - tools._FinaliseForTest() + tools.FinaliseOutputDir() def setUp(self): self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts') @@ -128,7 +128,7 @@ class TestNode(unittest.TestCase): @classmethod def tearDownClass(cls): - tools._FinaliseForTest() + tools.FinaliseOutputDir() def setUp(self): self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts') @@ -209,7 +209,7 @@ class TestProp(unittest.TestCase): @classmethod def tearDownClass(cls): - tools._FinaliseForTest() + tools.FinaliseOutputDir() def setUp(self): self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts') @@ -427,6 +427,10 @@ class TestFdtUtil(unittest.TestCase): def setUpClass(cls): tools.PrepareOutputDir(None) + @classmethod + def tearDownClass(cls): + tools.FinaliseOutputDir() + def setUp(self): self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts') self.node = self.dtb.GetNode('/spl-test') -- cgit v1.3.1 From 86af511d892df59f06bf49a71505a072ea2cd5f3 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:42 -0600 Subject: binman: Separate out testSplBssPad() At present this test runs binman twice, which means that the temporary files from the first run do not get cleaned up. Split this into two tests to fix this problem. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 9ef259a699b..ed787745606 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1022,10 +1022,12 @@ class TestFunctional(unittest.TestCase): data = self._DoReadFile('47_spl_bss_pad.dts') self.assertEqual(U_BOOT_SPL_DATA + (chr(0) * 10) + U_BOOT_DATA, data) + def testSplBssPadMissing(self): + """Test that a missing symbol is detected""" with open(self.TestFile('u_boot_ucode_ptr')) as fd: TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read()) with self.assertRaises(ValueError) as e: - data = self._DoReadFile('47_spl_bss_pad.dts') + self._DoReadFile('47_spl_bss_pad.dts') self.assertIn('Expected __bss_size symbol in spl/u-boot-spl', str(e.exception)) -- cgit v1.3.1 From 4b4bc06ef4e37f79604ff8fa2142057e2cb05437 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:43 -0600 Subject: buildman: dtoc: Suppress unwanted output from test There are a few test cases which print output. Suppress this so that tests can run silently in the normal case. Signed-off-by: Simon Glass --- tools/buildman/test.py | 4 +++- tools/dtoc/test_dtoc.py | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 7259f7b6507..e0c9d6da6a0 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -20,6 +20,7 @@ import control import command import commit import terminal +import test_util import toolchain use_network = True @@ -422,7 +423,8 @@ class TestBuild(unittest.TestCase): def testToolchainDownload(self): """Test that we can download toolchains""" if use_network: - url = self.toolchains.LocateArchUrl('arm') + with test_util.capture_sys_output() as (stdout, stderr): + url = self.toolchains.LocateArchUrl('arm') self.assertRegexpMatches(url, 'https://www.kernel.org/pub/tools/' 'crosstool/files/bin/x86_64/.*/' 'x86_64-gcc-.*-nolibc_arm-.*linux-gnueabi.tar.xz') diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 72bcb37244e..11bead12607 100644 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -385,7 +385,8 @@ U_BOOT_DEVICE(phandle_source2) = { def test_phandle_bad(self): """Test a node containing an invalid phandle fails""" - dtb_file = get_dtb_file('dtoc_test_phandle_bad.dts') + dtb_file = get_dtb_file('dtoc_test_phandle_bad.dts', + capture_stderr=True) output = tools.GetOutputFilename('output') with self.assertRaises(ValueError) as e: dtb_platdata.run_steps(['struct'], dtb_file, False, output) @@ -394,7 +395,8 @@ U_BOOT_DEVICE(phandle_source2) = { def test_phandle_bad2(self): """Test a phandle target missing its #*-cells property""" - dtb_file = get_dtb_file('dtoc_test_phandle_bad2.dts') + dtb_file = get_dtb_file('dtoc_test_phandle_bad2.dts', + capture_stderr=True) output = tools.GetOutputFilename('output') with self.assertRaises(ValueError) as e: dtb_platdata.run_steps(['struct'], dtb_file, False, output) -- cgit v1.3.1 From 1fda18205ff425d00faad57dc2ad69995cdbd15d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:44 -0600 Subject: tools: Set an initial value for indir This variable is not documented or set up in the module. Fix this. Signed-off-by: Simon Glass --- tools/patman/tools.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tools') diff --git a/tools/patman/tools.py b/tools/patman/tools.py index 1c9bf4e8100..bf099798e65 100644 --- a/tools/patman/tools.py +++ b/tools/patman/tools.py @@ -28,6 +28,9 @@ packages = { 'lz4': 'liblz4-tool', } +# List of paths to use when looking for an input file +indir = [] + def PrepareOutputDir(dirname, preserve=False): """Select an output directory, ensuring it exists. -- cgit v1.3.1 From 008b03000935c397fd604cc62a6813bcd72a30fc Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:45 -0600 Subject: patman: Don't clear progress in tout unless it was used At present calling Uninit() always called ClearProgress() which outputs a \r character as well as spaces to remove any progress information on the line. This can mess up the normal output of binman and other tools. Fix this by outputing this only when progress information has actually been previous written. Signed-off-by: Simon Glass --- tools/patman/tout.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/patman/tout.py b/tools/patman/tout.py index 4cd49e1c685..4957c7ae1df 100644 --- a/tools/patman/tout.py +++ b/tools/patman/tout.py @@ -15,6 +15,8 @@ NOTICE = 2 INFO = 3 DEBUG = 4 +in_progress = False + """ This class handles output of progress and other useful information to the user. It provides for simple verbosity level control and can @@ -48,9 +50,11 @@ def UserIsPresent(): def ClearProgress(): """Clear any active progress message on the terminal.""" - if verbose > 0 and stdout_is_tty: + global in_progress + if verbose > 0 and stdout_is_tty and in_progress: _stdout.write('\r%s\r' % (" " * len (_progress))) _stdout.flush() + in_progress = False def Progress(msg, warning=False, trailer='...'): """Display progress information. @@ -58,6 +62,7 @@ def Progress(msg, warning=False, trailer='...'): Args: msg: Message to display. warning: True if this is a warning.""" + global in_progress ClearProgress() if verbose > 0: _progress = msg + trailer @@ -65,6 +70,7 @@ def Progress(msg, warning=False, trailer='...'): col = _color.YELLOW if warning else _color.GREEN _stdout.write('\r' + _color.Color(col, _progress)) _stdout.flush() + in_progress = True else: _stdout.write(_progress + '\n') -- cgit v1.3.1 From 11ae93eef40c09280f36104b6a8cf5d807f0bb0d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 21:12:47 -0600 Subject: binman: Run tests concurrently At present the tests run one after the other using a single CPU. This is not very efficient. Bring in the concurrencytest module and run the tests concurrently, using one process for each CPU by default. A -P option allows this to be overridden, which is necessary for code-coverage to function correctly. This requires fixing a few tests which are currently not fully independent. At some point we might consider doing this across all pytests in U-Boot. There is a pytest version that supports specifying the number of processes to use, but it did not work for me. Signed-off-by: Simon Glass --- .travis.yml | 1 + test/py/README.md | 1 + tools/binman/binman.py | 26 ++++-- tools/binman/cmdline.py | 2 + tools/binman/entry_test.py | 7 +- tools/binman/ftest.py | 34 ++++---- tools/concurrencytest/.gitignore | 1 + tools/concurrencytest/README.md | 74 ++++++++++++++++ tools/concurrencytest/concurrencytest.py | 144 +++++++++++++++++++++++++++++++ tools/dtoc/dtoc.py | 2 + tools/dtoc/test_fdt.py | 2 + tools/patman/test_util.py | 2 +- 12 files changed, 274 insertions(+), 22 deletions(-) create mode 100644 tools/concurrencytest/.gitignore create mode 100644 tools/concurrencytest/README.md create mode 100644 tools/concurrencytest/concurrencytest.py (limited to 'tools') diff --git a/.travis.yml b/.travis.yml index 2b759c9d686..f78749afb56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ install: - virtualenv /tmp/venv - . /tmp/venv/bin/activate - pip install pytest + - pip install python-subunit - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - mkdir ~/grub2-arm - ( cd ~/grub2-arm; wget -O - http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm | rpm2cpio | cpio -di ) diff --git a/test/py/README.md b/test/py/README.md index aed2fd063a8..4d9d2b81d1e 100644 --- a/test/py/README.md +++ b/test/py/README.md @@ -29,6 +29,7 @@ tests. Similar package names should exist in other distributions. | -------------- | ----------------------------- | | python | 2.7.5-5ubuntu3 | | python-pytest | 2.5.1-1 | +| python-subunit | - | | gdisk | 0.8.8-1ubuntu0.1 | | dfu-util | 0.5-1 | | dtc | 1.4.0+dfsg-1 | diff --git a/tools/binman/binman.py b/tools/binman/binman.py index f5af5359f3c..439908e6650 100755 --- a/tools/binman/binman.py +++ b/tools/binman/binman.py @@ -10,6 +10,7 @@ """See README for more information""" import glob +import multiprocessing import os import sys import traceback @@ -17,7 +18,7 @@ import unittest # Bring in the patman and dtoc libraries our_path = os.path.dirname(os.path.realpath(__file__)) -for dirname in ['../patman', '../dtoc', '..']: +for dirname in ['../patman', '../dtoc', '..', '../concurrencytest']: sys.path.insert(0, os.path.join(our_path, dirname)) # Bring in the libfdt module @@ -27,16 +28,22 @@ sys.path.insert(0, os.path.join(our_path, import cmdline import command +use_concurrent = True +try: + from concurrencytest import ConcurrentTestSuite, fork_for_tests +except: + use_concurrent = False import control import test_util -def RunTests(debug, args): +def RunTests(debug, processes, args): """Run the functional tests and any embedded doctests Args: debug: True to enable debugging, which shows a full stack trace on error args: List of positional args provided to binman. This can hold a test name to execute (as in 'binman -t testSections', for example) + processes: Number of processes to use to run tests (None=same as #CPUs) """ import elf_test import entry_test @@ -54,19 +61,28 @@ def RunTests(debug, args): sys.argv = [sys.argv[0]] if debug: sys.argv.append('-D') + if debug: + sys.argv.append('-D') # Run the entry tests first ,since these need to be the first to import the # 'entry' module. test_name = args and args[0] or None + suite = unittest.TestSuite() + loader = unittest.TestLoader() for module in (entry_test.TestEntry, ftest.TestFunctional, fdt_test.TestFdt, elf_test.TestElf, image_test.TestImage): if test_name: try: - suite = unittest.TestLoader().loadTestsFromName(test_name, module) + suite.addTests(loader.loadTestsFromName(test_name, module)) except AttributeError: continue else: - suite = unittest.TestLoader().loadTestsFromTestCase(module) + suite.addTests(loader.loadTestsFromTestCase(module)) + if use_concurrent and processes != 1: + concurrent_suite = ConcurrentTestSuite(suite, + fork_for_tests(processes or multiprocessing.cpu_count())) + concurrent_suite.run(result) + else: suite.run(result) print result @@ -115,7 +131,7 @@ def RunBinman(options, args): sys.tracebacklimit = 0 if options.test: - ret_code = RunTests(options.debug, args[1:]) + ret_code = RunTests(options.debug, options.processes, args[1:]) elif options.test_coverage: RunTestCoverage() diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py index f8caa7d2841..3886d52b3a0 100644 --- a/tools/binman/cmdline.py +++ b/tools/binman/cmdline.py @@ -46,6 +46,8 @@ def ParseArgs(argv): parser.add_option('-p', '--preserve', action='store_true',\ help='Preserve temporary output directory even if option -O is not ' 'given') + parser.add_option('-P', '--processes', type=int, + help='set number of processes to use for running tests') parser.add_option('-t', '--test', action='store_true', default=False, help='run tests') parser.add_option('-T', '--test-coverage', action='store_true', diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index a8bc938f9e9..17ab2290140 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -13,6 +13,8 @@ import fdt import fdt_util import tools +entry = None + class TestEntry(unittest.TestCase): def setUp(self): tools.PrepareOutputDir(None) @@ -38,7 +40,10 @@ class TestEntry(unittest.TestCase): def test2EntryImportLib(self): del sys.modules['importlib'] global entry - reload(entry) + if entry: + reload(entry) + else: + import entry entry.Entry.Create(None, self.GetNode(), 'u-boot-spl') del entry diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index ed787745606..9f21027bd40 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -367,6 +367,16 @@ class TestFunctional(unittest.TestCase): os.makedirs(pathname) return pathname + @classmethod + def _SetupSplElf(self, src_fname='bss_data'): + """Set up an ELF file with a '_dt_ucode_base_size' symbol + + Args: + Filename of ELF file to use as SPL + """ + with open(self.TestFile(src_fname)) as fd: + TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read()) + @classmethod def TestFile(self, fname): return os.path.join(self._binman_dir, 'test', fname) @@ -715,8 +725,7 @@ class TestFunctional(unittest.TestCase): def testImagePadByte(self): """Test that the image pad byte can be specified""" - with open(self.TestFile('bss_data')) as fd: - TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read()) + self._SetupSplElf() data = self._DoReadFile('21_image_pad.dts') self.assertEqual(U_BOOT_SPL_DATA + (chr(0xff) * 1) + U_BOOT_DATA, data) @@ -739,6 +748,7 @@ class TestFunctional(unittest.TestCase): def testPackSorted(self): """Test that entries can be sorted""" + self._SetupSplElf() data = self._DoReadFile('24_sorted.dts') self.assertEqual(chr(0) * 1 + U_BOOT_SPL_DATA + chr(0) * 2 + U_BOOT_DATA, data) @@ -781,6 +791,7 @@ class TestFunctional(unittest.TestCase): def testPackX86Rom(self): """Test that a basic x86 ROM can be created""" + self._SetupSplElf() data = self._DoReadFile('29_x86-rom.dts') self.assertEqual(U_BOOT_DATA + chr(0) * 7 + U_BOOT_SPL_DATA + chr(0) * 2, data) @@ -1017,15 +1028,13 @@ class TestFunctional(unittest.TestCase): def testSplBssPad(self): """Test that we can pad SPL's BSS with zeros""" # ELF file with a '__bss_size' symbol - with open(self.TestFile('bss_data')) as fd: - TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read()) + self._SetupSplElf() data = self._DoReadFile('47_spl_bss_pad.dts') self.assertEqual(U_BOOT_SPL_DATA + (chr(0) * 10) + U_BOOT_DATA, data) def testSplBssPadMissing(self): """Test that a missing symbol is detected""" - with open(self.TestFile('u_boot_ucode_ptr')) as fd: - TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read()) + self._SetupSplElf('u_boot_ucode_ptr') with self.assertRaises(ValueError) as e: self._DoReadFile('47_spl_bss_pad.dts') self.assertIn('Expected __bss_size symbol in spl/u-boot-spl', @@ -1050,9 +1059,7 @@ class TestFunctional(unittest.TestCase): ucode_second: True if the microsecond entry is second instead of third """ - # ELF file with a '_dt_ucode_base_size' symbol - with open(self.TestFile('u_boot_ucode_ptr')) as fd: - TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read()) + self._SetupSplElf('u_boot_ucode_ptr') first, pos_and_size = self._RunMicrocodeTest(dts, U_BOOT_SPL_NODTB_DATA, ucode_second=ucode_second) self.assertEqual('splnodtb with microc' + pos_and_size + @@ -1094,8 +1101,7 @@ class TestFunctional(unittest.TestCase): addr = elf.GetSymbolAddress(elf_fname, '__image_copy_start') self.assertEqual(syms['_binman_u_boot_spl_prop_offset'].address, addr) - with open(self.TestFile('u_boot_binman_syms')) as fd: - TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read()) + self._SetupSplElf('u_boot_binman_syms') data = self._DoReadFile('53_symbols.dts') sym_values = struct.pack(' Date: Mon, 1 Oct 2018 12:22:30 -0600 Subject: binman: Move to three-digit test-file numbers We now have 99 tests. Before adding any more, rename everything to three digits. This helps to preserve the ordering of tests and makes it easier to find things. Signed-off-by: Simon Glass --- tools/binman/entry_test.py | 2 +- tools/binman/fdt_test.py | 4 +- tools/binman/ftest.py | 224 ++++++++++----------- tools/binman/test/001_invalid.dts | 5 + tools/binman/test/002_missing_node.dts | 6 + tools/binman/test/003_empty.dts | 9 + tools/binman/test/004_invalid_entry.dts | 11 + tools/binman/test/005_simple.dts | 11 + tools/binman/test/006_dual_image.dts | 22 ++ tools/binman/test/007_bad_align.dts | 12 ++ tools/binman/test/008_pack.dts | 30 +++ tools/binman/test/009_pack_extra.dts | 35 ++++ tools/binman/test/010_pack_align_power2.dts | 12 ++ tools/binman/test/011_pack_align_size_power2.dts | 12 ++ tools/binman/test/012_pack_inv_align.dts | 13 ++ tools/binman/test/013_pack_inv_size_align.dts | 13 ++ tools/binman/test/014_pack_overlap.dts | 16 ++ tools/binman/test/015_pack_overflow.dts | 12 ++ tools/binman/test/016_pack_image_overflow.dts | 13 ++ tools/binman/test/017_pack_image_size.dts | 13 ++ tools/binman/test/018_pack_image_align.dts | 13 ++ tools/binman/test/019_pack_inv_image_align.dts | 14 ++ tools/binman/test/01_invalid.dts | 5 - .../test/020_pack_inv_image_align_power2.dts | 13 ++ tools/binman/test/021_image_pad.dts | 16 ++ tools/binman/test/022_image_name.dts | 21 ++ tools/binman/test/023_blob.dts | 12 ++ tools/binman/test/024_sorted.dts | 17 ++ tools/binman/test/025_pack_zero_size.dts | 15 ++ tools/binman/test/026_pack_u_boot_dtb.dts | 14 ++ tools/binman/test/027_pack_4gb_no_size.dts | 18 ++ tools/binman/test/028_pack_4gb_outside.dts | 19 ++ tools/binman/test/029_x86-rom.dts | 19 ++ tools/binman/test/02_missing_node.dts | 6 - tools/binman/test/030_x86-rom-me-no-desc.dts | 16 ++ tools/binman/test/031_x86-rom-me.dts | 20 ++ tools/binman/test/032_intel-vga.dts | 14 ++ tools/binman/test/033_x86-start16.dts | 13 ++ tools/binman/test/034_x86_ucode.dts | 29 +++ tools/binman/test/035_x86_single_ucode.dts | 26 +++ tools/binman/test/036_u_boot_img.dts | 11 + tools/binman/test/037_x86_no_ucode.dts | 20 ++ tools/binman/test/038_x86_ucode_missing_node.dts | 26 +++ tools/binman/test/039_x86_ucode_missing_node2.dts | 23 +++ tools/binman/test/03_empty.dts | 9 - tools/binman/test/040_x86_ucode_not_in_image.dts | 28 +++ tools/binman/test/041_unknown_pos_size.dts | 12 ++ tools/binman/test/042_intel-fsp.dts | 14 ++ tools/binman/test/043_intel-cmc.dts | 14 ++ tools/binman/test/044_x86_optional_ucode.dts | 30 +++ tools/binman/test/045_prop_test.dts | 23 +++ tools/binman/test/046_intel-vbt.dts | 14 ++ tools/binman/test/047_spl_bss_pad.dts | 17 ++ tools/binman/test/048_x86-start16-spl.dts | 13 ++ tools/binman/test/049_x86_ucode_spl.dts | 29 +++ tools/binman/test/04_invalid_entry.dts | 11 - tools/binman/test/050_intel_mrc.dts | 13 ++ tools/binman/test/051_u_boot_spl_dtb.dts | 13 ++ tools/binman/test/052_u_boot_spl_nodtb.dts | 11 + tools/binman/test/053_symbols.dts | 20 ++ tools/binman/test/054_unit_address.dts | 15 ++ tools/binman/test/055_sections.dts | 32 +++ tools/binman/test/056_name_prefix.dts | 30 +++ tools/binman/test/057_unknown_contents.dts | 14 ++ .../binman/test/058_x86_ucode_spl_needs_retry.dts | 36 ++++ tools/binman/test/059_change_size.dts | 14 ++ tools/binman/test/05_simple.dts | 11 - tools/binman/test/060_fdt_update.dts | 31 +++ tools/binman/test/061_fdt_update_bad.dts | 32 +++ tools/binman/test/062_entry_args.dts | 14 ++ tools/binman/test/063_entry_args_missing.dts | 13 ++ tools/binman/test/064_entry_args_required.dts | 14 ++ .../test/065_entry_args_unknown_datatype.dts | 15 ++ tools/binman/test/066_text.dts | 28 +++ tools/binman/test/067_fmap.dts | 29 +++ tools/binman/test/068_blob_named_by_arg.dts | 12 ++ tools/binman/test/069_fill.dts | 15 ++ tools/binman/test/06_dual_image.dts | 22 -- tools/binman/test/070_fill_no_size.dts | 14 ++ tools/binman/test/071_gbb.dts | 31 +++ tools/binman/test/072_gbb_too_small.dts | 10 + tools/binman/test/073_gbb_no_size.dts | 9 + tools/binman/test/074_vblock.dts | 28 +++ tools/binman/test/075_vblock_no_content.dts | 23 +++ tools/binman/test/076_vblock_bad_phandle.dts | 24 +++ tools/binman/test/077_vblock_bad_entry.dts | 27 +++ tools/binman/test/078_u_boot_tpl.dts | 11 + tools/binman/test/079_uses_pos.dts | 10 + tools/binman/test/07_bad_align.dts | 12 -- tools/binman/test/080_fill_empty.dts | 15 ++ tools/binman/test/081_x86-start16-tpl.dts | 14 ++ tools/binman/test/082_fdt_update_all.dts | 18 ++ tools/binman/test/083_compress.dts | 11 + tools/binman/test/084_files.dts | 11 + tools/binman/test/085_files_compress.dts | 11 + tools/binman/test/086_files_none.dts | 12 ++ tools/binman/test/087_files_no_pattern.dts | 11 + tools/binman/test/088_expand_size.dts | 43 ++++ tools/binman/test/089_expand_size_bad.dts | 14 ++ tools/binman/test/08_pack.dts | 30 --- tools/binman/test/090_hash.dts | 12 ++ tools/binman/test/091_hash_no_algo.dts | 11 + tools/binman/test/092_hash_bad_algo.dts | 12 ++ tools/binman/test/093_x86_tpl_ucode.dts | 29 +++ tools/binman/test/094_fmap_x86.dts | 20 ++ tools/binman/test/095_fmap_x86_section.dts | 22 ++ tools/binman/test/096_elf.dts | 14 ++ tools/binman/test/097_elf_strip.dts | 15 ++ tools/binman/test/099_hash_section.dts | 18 ++ tools/binman/test/09_pack_extra.dts | 35 ---- tools/binman/test/10_pack_align_power2.dts | 12 -- tools/binman/test/11_pack_align_size_power2.dts | 12 -- tools/binman/test/12_pack_inv_align.dts | 13 -- tools/binman/test/13_pack_inv_size_align.dts | 13 -- tools/binman/test/14_pack_overlap.dts | 16 -- tools/binman/test/15_pack_overflow.dts | 12 -- tools/binman/test/16_pack_image_overflow.dts | 13 -- tools/binman/test/17_pack_image_size.dts | 13 -- tools/binman/test/18_pack_image_align.dts | 13 -- tools/binman/test/19_pack_inv_image_align.dts | 14 -- .../binman/test/20_pack_inv_image_align_power2.dts | 13 -- tools/binman/test/21_image_pad.dts | 16 -- tools/binman/test/22_image_name.dts | 21 -- tools/binman/test/23_blob.dts | 12 -- tools/binman/test/24_sorted.dts | 17 -- tools/binman/test/25_pack_zero_size.dts | 15 -- tools/binman/test/26_pack_u_boot_dtb.dts | 14 -- tools/binman/test/27_pack_4gb_no_size.dts | 18 -- tools/binman/test/28_pack_4gb_outside.dts | 19 -- tools/binman/test/29_x86-rom.dts | 19 -- tools/binman/test/30_x86-rom-me-no-desc.dts | 16 -- tools/binman/test/31_x86-rom-me.dts | 20 -- tools/binman/test/32_intel-vga.dts | 14 -- tools/binman/test/33_x86-start16.dts | 13 -- tools/binman/test/34_x86_ucode.dts | 29 --- tools/binman/test/35_x86_single_ucode.dts | 26 --- tools/binman/test/36_u_boot_img.dts | 11 - tools/binman/test/37_x86_no_ucode.dts | 20 -- tools/binman/test/38_x86_ucode_missing_node.dts | 26 --- tools/binman/test/39_x86_ucode_missing_node2.dts | 23 --- tools/binman/test/40_x86_ucode_not_in_image.dts | 28 --- tools/binman/test/41_unknown_pos_size.dts | 12 -- tools/binman/test/42_intel-fsp.dts | 14 -- tools/binman/test/43_intel-cmc.dts | 14 -- tools/binman/test/44_x86_optional_ucode.dts | 30 --- tools/binman/test/45_prop_test.dts | 23 --- tools/binman/test/46_intel-vbt.dts | 14 -- tools/binman/test/47_spl_bss_pad.dts | 17 -- tools/binman/test/48_x86-start16-spl.dts | 13 -- tools/binman/test/49_x86_ucode_spl.dts | 29 --- tools/binman/test/50_intel_mrc.dts | 13 -- tools/binman/test/51_u_boot_spl_dtb.dts | 13 -- tools/binman/test/52_u_boot_spl_nodtb.dts | 11 - tools/binman/test/53_symbols.dts | 20 -- tools/binman/test/54_unit_address.dts | 15 -- tools/binman/test/55_sections.dts | 32 --- tools/binman/test/56_name_prefix.dts | 30 --- tools/binman/test/57_unknown_contents.dts | 14 -- tools/binman/test/58_x86_ucode_spl_needs_retry.dts | 36 ---- tools/binman/test/59_change_size.dts | 14 -- tools/binman/test/60_fdt_update.dts | 31 --- tools/binman/test/61_fdt_update_bad.dts | 32 --- tools/binman/test/62_entry_args.dts | 14 -- tools/binman/test/63_entry_args_missing.dts | 13 -- tools/binman/test/64_entry_args_required.dts | 14 -- .../binman/test/65_entry_args_unknown_datatype.dts | 15 -- tools/binman/test/66_text.dts | 28 --- tools/binman/test/67_fmap.dts | 29 --- tools/binman/test/68_blob_named_by_arg.dts | 12 -- tools/binman/test/69_fill.dts | 15 -- tools/binman/test/70_fill_no_size.dts | 14 -- tools/binman/test/71_gbb.dts | 31 --- tools/binman/test/72_gbb_too_small.dts | 10 - tools/binman/test/73_gbb_no_size.dts | 9 - tools/binman/test/74_vblock.dts | 28 --- tools/binman/test/75_vblock_no_content.dts | 23 --- tools/binman/test/76_vblock_bad_phandle.dts | 24 --- tools/binman/test/77_vblock_bad_entry.dts | 27 --- tools/binman/test/78_u_boot_tpl.dts | 11 - tools/binman/test/79_uses_pos.dts | 10 - tools/binman/test/80_fill_empty.dts | 15 -- tools/binman/test/81_x86-start16-tpl.dts | 14 -- tools/binman/test/82_fdt_update_all.dts | 18 -- tools/binman/test/83_compress.dts | 11 - tools/binman/test/84_files.dts | 11 - tools/binman/test/85_files_compress.dts | 11 - tools/binman/test/86_files_none.dts | 12 -- tools/binman/test/87_files_no_pattern.dts | 11 - tools/binman/test/88_expand_size.dts | 43 ---- tools/binman/test/89_expand_size_bad.dts | 14 -- tools/binman/test/90_hash.dts | 12 -- tools/binman/test/91_hash_no_algo.dts | 11 - tools/binman/test/92_hash_bad_algo.dts | 12 -- tools/binman/test/93_x86_tpl_ucode.dts | 29 --- tools/binman/test/94_fmap_x86.dts | 20 -- tools/binman/test/95_fmap_x86_section.dts | 22 -- tools/binman/test/96_elf.dts | 14 -- tools/binman/test/97_elf_strip.dts | 15 -- tools/binman/test/99_hash_section.dts | 18 -- 199 files changed, 1844 insertions(+), 1844 deletions(-) create mode 100644 tools/binman/test/001_invalid.dts create mode 100644 tools/binman/test/002_missing_node.dts create mode 100644 tools/binman/test/003_empty.dts create mode 100644 tools/binman/test/004_invalid_entry.dts create mode 100644 tools/binman/test/005_simple.dts create mode 100644 tools/binman/test/006_dual_image.dts create mode 100644 tools/binman/test/007_bad_align.dts create mode 100644 tools/binman/test/008_pack.dts create mode 100644 tools/binman/test/009_pack_extra.dts create mode 100644 tools/binman/test/010_pack_align_power2.dts create mode 100644 tools/binman/test/011_pack_align_size_power2.dts create mode 100644 tools/binman/test/012_pack_inv_align.dts create mode 100644 tools/binman/test/013_pack_inv_size_align.dts create mode 100644 tools/binman/test/014_pack_overlap.dts create mode 100644 tools/binman/test/015_pack_overflow.dts create mode 100644 tools/binman/test/016_pack_image_overflow.dts create mode 100644 tools/binman/test/017_pack_image_size.dts create mode 100644 tools/binman/test/018_pack_image_align.dts create mode 100644 tools/binman/test/019_pack_inv_image_align.dts delete mode 100644 tools/binman/test/01_invalid.dts create mode 100644 tools/binman/test/020_pack_inv_image_align_power2.dts create mode 100644 tools/binman/test/021_image_pad.dts create mode 100644 tools/binman/test/022_image_name.dts create mode 100644 tools/binman/test/023_blob.dts create mode 100644 tools/binman/test/024_sorted.dts create mode 100644 tools/binman/test/025_pack_zero_size.dts create mode 100644 tools/binman/test/026_pack_u_boot_dtb.dts create mode 100644 tools/binman/test/027_pack_4gb_no_size.dts create mode 100644 tools/binman/test/028_pack_4gb_outside.dts create mode 100644 tools/binman/test/029_x86-rom.dts delete mode 100644 tools/binman/test/02_missing_node.dts create mode 100644 tools/binman/test/030_x86-rom-me-no-desc.dts create mode 100644 tools/binman/test/031_x86-rom-me.dts create mode 100644 tools/binman/test/032_intel-vga.dts create mode 100644 tools/binman/test/033_x86-start16.dts create mode 100644 tools/binman/test/034_x86_ucode.dts create mode 100644 tools/binman/test/035_x86_single_ucode.dts create mode 100644 tools/binman/test/036_u_boot_img.dts create mode 100644 tools/binman/test/037_x86_no_ucode.dts create mode 100644 tools/binman/test/038_x86_ucode_missing_node.dts create mode 100644 tools/binman/test/039_x86_ucode_missing_node2.dts delete mode 100644 tools/binman/test/03_empty.dts create mode 100644 tools/binman/test/040_x86_ucode_not_in_image.dts create mode 100644 tools/binman/test/041_unknown_pos_size.dts create mode 100644 tools/binman/test/042_intel-fsp.dts create mode 100644 tools/binman/test/043_intel-cmc.dts create mode 100644 tools/binman/test/044_x86_optional_ucode.dts create mode 100644 tools/binman/test/045_prop_test.dts create mode 100644 tools/binman/test/046_intel-vbt.dts create mode 100644 tools/binman/test/047_spl_bss_pad.dts create mode 100644 tools/binman/test/048_x86-start16-spl.dts create mode 100644 tools/binman/test/049_x86_ucode_spl.dts delete mode 100644 tools/binman/test/04_invalid_entry.dts create mode 100644 tools/binman/test/050_intel_mrc.dts create mode 100644 tools/binman/test/051_u_boot_spl_dtb.dts create mode 100644 tools/binman/test/052_u_boot_spl_nodtb.dts create mode 100644 tools/binman/test/053_symbols.dts create mode 100644 tools/binman/test/054_unit_address.dts create mode 100644 tools/binman/test/055_sections.dts create mode 100644 tools/binman/test/056_name_prefix.dts create mode 100644 tools/binman/test/057_unknown_contents.dts create mode 100644 tools/binman/test/058_x86_ucode_spl_needs_retry.dts create mode 100644 tools/binman/test/059_change_size.dts delete mode 100644 tools/binman/test/05_simple.dts create mode 100644 tools/binman/test/060_fdt_update.dts create mode 100644 tools/binman/test/061_fdt_update_bad.dts create mode 100644 tools/binman/test/062_entry_args.dts create mode 100644 tools/binman/test/063_entry_args_missing.dts create mode 100644 tools/binman/test/064_entry_args_required.dts create mode 100644 tools/binman/test/065_entry_args_unknown_datatype.dts create mode 100644 tools/binman/test/066_text.dts create mode 100644 tools/binman/test/067_fmap.dts create mode 100644 tools/binman/test/068_blob_named_by_arg.dts create mode 100644 tools/binman/test/069_fill.dts delete mode 100644 tools/binman/test/06_dual_image.dts create mode 100644 tools/binman/test/070_fill_no_size.dts create mode 100644 tools/binman/test/071_gbb.dts create mode 100644 tools/binman/test/072_gbb_too_small.dts create mode 100644 tools/binman/test/073_gbb_no_size.dts create mode 100644 tools/binman/test/074_vblock.dts create mode 100644 tools/binman/test/075_vblock_no_content.dts create mode 100644 tools/binman/test/076_vblock_bad_phandle.dts create mode 100644 tools/binman/test/077_vblock_bad_entry.dts create mode 100644 tools/binman/test/078_u_boot_tpl.dts create mode 100644 tools/binman/test/079_uses_pos.dts delete mode 100644 tools/binman/test/07_bad_align.dts create mode 100644 tools/binman/test/080_fill_empty.dts create mode 100644 tools/binman/test/081_x86-start16-tpl.dts create mode 100644 tools/binman/test/082_fdt_update_all.dts create mode 100644 tools/binman/test/083_compress.dts create mode 100644 tools/binman/test/084_files.dts create mode 100644 tools/binman/test/085_files_compress.dts create mode 100644 tools/binman/test/086_files_none.dts create mode 100644 tools/binman/test/087_files_no_pattern.dts create mode 100644 tools/binman/test/088_expand_size.dts create mode 100644 tools/binman/test/089_expand_size_bad.dts delete mode 100644 tools/binman/test/08_pack.dts create mode 100644 tools/binman/test/090_hash.dts create mode 100644 tools/binman/test/091_hash_no_algo.dts create mode 100644 tools/binman/test/092_hash_bad_algo.dts create mode 100644 tools/binman/test/093_x86_tpl_ucode.dts create mode 100644 tools/binman/test/094_fmap_x86.dts create mode 100644 tools/binman/test/095_fmap_x86_section.dts create mode 100644 tools/binman/test/096_elf.dts create mode 100644 tools/binman/test/097_elf_strip.dts create mode 100644 tools/binman/test/099_hash_section.dts delete mode 100644 tools/binman/test/09_pack_extra.dts delete mode 100644 tools/binman/test/10_pack_align_power2.dts delete mode 100644 tools/binman/test/11_pack_align_size_power2.dts delete mode 100644 tools/binman/test/12_pack_inv_align.dts delete mode 100644 tools/binman/test/13_pack_inv_size_align.dts delete mode 100644 tools/binman/test/14_pack_overlap.dts delete mode 100644 tools/binman/test/15_pack_overflow.dts delete mode 100644 tools/binman/test/16_pack_image_overflow.dts delete mode 100644 tools/binman/test/17_pack_image_size.dts delete mode 100644 tools/binman/test/18_pack_image_align.dts delete mode 100644 tools/binman/test/19_pack_inv_image_align.dts delete mode 100644 tools/binman/test/20_pack_inv_image_align_power2.dts delete mode 100644 tools/binman/test/21_image_pad.dts delete mode 100644 tools/binman/test/22_image_name.dts delete mode 100644 tools/binman/test/23_blob.dts delete mode 100644 tools/binman/test/24_sorted.dts delete mode 100644 tools/binman/test/25_pack_zero_size.dts delete mode 100644 tools/binman/test/26_pack_u_boot_dtb.dts delete mode 100644 tools/binman/test/27_pack_4gb_no_size.dts delete mode 100644 tools/binman/test/28_pack_4gb_outside.dts delete mode 100644 tools/binman/test/29_x86-rom.dts delete mode 100644 tools/binman/test/30_x86-rom-me-no-desc.dts delete mode 100644 tools/binman/test/31_x86-rom-me.dts delete mode 100644 tools/binman/test/32_intel-vga.dts delete mode 100644 tools/binman/test/33_x86-start16.dts delete mode 100644 tools/binman/test/34_x86_ucode.dts delete mode 100644 tools/binman/test/35_x86_single_ucode.dts delete mode 100644 tools/binman/test/36_u_boot_img.dts delete mode 100644 tools/binman/test/37_x86_no_ucode.dts delete mode 100644 tools/binman/test/38_x86_ucode_missing_node.dts delete mode 100644 tools/binman/test/39_x86_ucode_missing_node2.dts delete mode 100644 tools/binman/test/40_x86_ucode_not_in_image.dts delete mode 100644 tools/binman/test/41_unknown_pos_size.dts delete mode 100644 tools/binman/test/42_intel-fsp.dts delete mode 100644 tools/binman/test/43_intel-cmc.dts delete mode 100644 tools/binman/test/44_x86_optional_ucode.dts delete mode 100644 tools/binman/test/45_prop_test.dts delete mode 100644 tools/binman/test/46_intel-vbt.dts delete mode 100644 tools/binman/test/47_spl_bss_pad.dts delete mode 100644 tools/binman/test/48_x86-start16-spl.dts delete mode 100644 tools/binman/test/49_x86_ucode_spl.dts delete mode 100644 tools/binman/test/50_intel_mrc.dts delete mode 100644 tools/binman/test/51_u_boot_spl_dtb.dts delete mode 100644 tools/binman/test/52_u_boot_spl_nodtb.dts delete mode 100644 tools/binman/test/53_symbols.dts delete mode 100644 tools/binman/test/54_unit_address.dts delete mode 100644 tools/binman/test/55_sections.dts delete mode 100644 tools/binman/test/56_name_prefix.dts delete mode 100644 tools/binman/test/57_unknown_contents.dts delete mode 100644 tools/binman/test/58_x86_ucode_spl_needs_retry.dts delete mode 100644 tools/binman/test/59_change_size.dts delete mode 100644 tools/binman/test/60_fdt_update.dts delete mode 100644 tools/binman/test/61_fdt_update_bad.dts delete mode 100644 tools/binman/test/62_entry_args.dts delete mode 100644 tools/binman/test/63_entry_args_missing.dts delete mode 100644 tools/binman/test/64_entry_args_required.dts delete mode 100644 tools/binman/test/65_entry_args_unknown_datatype.dts delete mode 100644 tools/binman/test/66_text.dts delete mode 100644 tools/binman/test/67_fmap.dts delete mode 100644 tools/binman/test/68_blob_named_by_arg.dts delete mode 100644 tools/binman/test/69_fill.dts delete mode 100644 tools/binman/test/70_fill_no_size.dts delete mode 100644 tools/binman/test/71_gbb.dts delete mode 100644 tools/binman/test/72_gbb_too_small.dts delete mode 100644 tools/binman/test/73_gbb_no_size.dts delete mode 100644 tools/binman/test/74_vblock.dts delete mode 100644 tools/binman/test/75_vblock_no_content.dts delete mode 100644 tools/binman/test/76_vblock_bad_phandle.dts delete mode 100644 tools/binman/test/77_vblock_bad_entry.dts delete mode 100644 tools/binman/test/78_u_boot_tpl.dts delete mode 100644 tools/binman/test/79_uses_pos.dts delete mode 100644 tools/binman/test/80_fill_empty.dts delete mode 100644 tools/binman/test/81_x86-start16-tpl.dts delete mode 100644 tools/binman/test/82_fdt_update_all.dts delete mode 100644 tools/binman/test/83_compress.dts delete mode 100644 tools/binman/test/84_files.dts delete mode 100644 tools/binman/test/85_files_compress.dts delete mode 100644 tools/binman/test/86_files_none.dts delete mode 100644 tools/binman/test/87_files_no_pattern.dts delete mode 100644 tools/binman/test/88_expand_size.dts delete mode 100644 tools/binman/test/89_expand_size_bad.dts delete mode 100644 tools/binman/test/90_hash.dts delete mode 100644 tools/binman/test/91_hash_no_algo.dts delete mode 100644 tools/binman/test/92_hash_bad_algo.dts delete mode 100644 tools/binman/test/93_x86_tpl_ucode.dts delete mode 100644 tools/binman/test/94_fmap_x86.dts delete mode 100644 tools/binman/test/95_fmap_x86_section.dts delete mode 100644 tools/binman/test/96_elf.dts delete mode 100644 tools/binman/test/97_elf_strip.dts delete mode 100644 tools/binman/test/99_hash_section.dts (limited to 'tools') diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index 17ab2290140..1f7ff5b4e41 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -25,7 +25,7 @@ class TestEntry(unittest.TestCase): def GetNode(self): binman_dir = os.path.dirname(os.path.realpath(sys.argv[0])) fname = fdt_util.EnsureCompiled( - os.path.join(binman_dir,('test/05_simple.dts'))) + os.path.join(binman_dir,('test/005_simple.dts'))) dtb = fdt.FdtScan(fname) return dtb.GetNode('/binman/u-boot') diff --git a/tools/binman/fdt_test.py b/tools/binman/fdt_test.py index b9167012d25..ac6f910d3c0 100644 --- a/tools/binman/fdt_test.py +++ b/tools/binman/fdt_test.py @@ -36,12 +36,12 @@ class TestFdt(unittest.TestCase): node.DeleteProp('data') def testFdtNormal(self): - fname = self.GetCompiled('34_x86_ucode.dts') + fname = self.GetCompiled('034_x86_ucode.dts') dt = FdtScan(fname) self._DeleteProp(dt) def testFdtNormalProp(self): - fname = self.GetCompiled('45_prop_test.dts') + fname = self.GetCompiled('045_prop_test.dts') dt = FdtScan(fname) node = dt.GetNode('/binman/intel-me') self.assertEquals('intel-me', node.name) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 9f21027bd40..167f56dd060 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -189,7 +189,7 @@ class TestFunctional(unittest.TestCase): """Run binman with a given test file Args: - fname: Device-tree source filename to use (e.g. 05_simple.dts) + fname: Device-tree source filename to use (e.g. 005_simple.dts) debug: True to enable debugging output map: True to output map files for the images update_dtb: Update the offset and size of each entry in the device @@ -266,7 +266,7 @@ class TestFunctional(unittest.TestCase): Raises an assertion failure if binman returns a non-zero exit code. Args: - fname: Device-tree source filename to use (e.g. 05_simple.dts) + fname: Device-tree source filename to use (e.g. 005_simple.dts) use_real_dtb: True to use the test file as the contents of the u-boot-dtb entry. Normally this is not needed and the test contents (the U_BOOT_DTB_DATA string) can be used. @@ -323,7 +323,7 @@ class TestFunctional(unittest.TestCase): """Helper function which discards the device-tree binary Args: - fname: Device-tree source filename to use (e.g. 05_simple.dts) + fname: Device-tree source filename to use (e.g. 005_simple.dts) use_real_dtb: True to use the test file as the contents of the u-boot-dtb entry. Normally this is not needed and the test contents (the U_BOOT_DTB_DATA string) can be used. @@ -464,7 +464,7 @@ class TestFunctional(unittest.TestCase): def testBoard(self): """Test that we can run it with a specific board""" - self._SetupDtb('05_simple.dts', 'sandbox/u-boot.dtb') + self._SetupDtb('005_simple.dts', 'sandbox/u-boot.dtb') TestFunctional._MakeInputFile('sandbox/u-boot.bin', U_BOOT_DATA) result = self._DoBinman('-b', 'sandbox') self.assertEqual(0, result) @@ -491,19 +491,19 @@ class TestFunctional(unittest.TestCase): will come from the device-tree compiler (dtc). """ with self.assertRaises(Exception) as e: - self._RunBinman('-d', self.TestFile('01_invalid.dts')) + self._RunBinman('-d', self.TestFile('001_invalid.dts')) self.assertIn("FATAL ERROR: Unable to parse input tree", str(e.exception)) def testMissingNode(self): """Test that a device tree without a 'binman' node generates an error""" with self.assertRaises(Exception) as e: - self._DoBinman('-d', self.TestFile('02_missing_node.dts')) + self._DoBinman('-d', self.TestFile('002_missing_node.dts')) self.assertIn("does not have a 'binman' node", str(e.exception)) def testEmpty(self): """Test that an empty binman node works OK (i.e. does nothing)""" - result = self._RunBinman('-d', self.TestFile('03_empty.dts')) + result = self._RunBinman('-d', self.TestFile('003_empty.dts')) self.assertEqual(0, len(result.stderr)) self.assertEqual(0, result.return_code) @@ -511,25 +511,25 @@ class TestFunctional(unittest.TestCase): """Test that an invalid entry is flagged""" with self.assertRaises(Exception) as e: result = self._RunBinman('-d', - self.TestFile('04_invalid_entry.dts')) + self.TestFile('004_invalid_entry.dts')) self.assertIn("Unknown entry type 'not-a-valid-type' in node " "'/binman/not-a-valid-type'", str(e.exception)) def testSimple(self): """Test a simple binman with a single file""" - data = self._DoReadFile('05_simple.dts') + data = self._DoReadFile('005_simple.dts') self.assertEqual(U_BOOT_DATA, data) def testSimpleDebug(self): """Test a simple binman run with debugging enabled""" - data = self._DoTestFile('05_simple.dts', debug=True) + data = self._DoTestFile('005_simple.dts', debug=True) def testDual(self): """Test that we can handle creating two images This also tests image padding. """ - retcode = self._DoTestFile('06_dual_image.dts') + retcode = self._DoTestFile('006_dual_image.dts') self.assertEqual(0, retcode) image = control.images['image1'] @@ -553,13 +553,13 @@ class TestFunctional(unittest.TestCase): def testBadAlign(self): """Test that an invalid alignment value is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('07_bad_align.dts') + self._DoTestFile('007_bad_align.dts') self.assertIn("Node '/binman/u-boot': Alignment 23 must be a power " "of two", str(e.exception)) def testPackSimple(self): """Test that packing works as expected""" - retcode = self._DoTestFile('08_pack.dts') + retcode = self._DoTestFile('008_pack.dts') self.assertEqual(0, retcode) self.assertIn('image', control.images) image = control.images['image'] @@ -601,7 +601,7 @@ class TestFunctional(unittest.TestCase): def testPackExtra(self): """Test that extra packing feature works as expected""" - retcode = self._DoTestFile('09_pack_extra.dts') + retcode = self._DoTestFile('009_pack_extra.dts') self.assertEqual(0, retcode) self.assertIn('image', control.images) @@ -646,35 +646,35 @@ class TestFunctional(unittest.TestCase): def testPackAlignPowerOf2(self): """Test that invalid entry alignment is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('10_pack_align_power2.dts') + self._DoTestFile('010_pack_align_power2.dts') self.assertIn("Node '/binman/u-boot': Alignment 5 must be a power " "of two", str(e.exception)) def testPackAlignSizePowerOf2(self): """Test that invalid entry size alignment is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('11_pack_align_size_power2.dts') + self._DoTestFile('011_pack_align_size_power2.dts') self.assertIn("Node '/binman/u-boot': Alignment size 55 must be a " "power of two", str(e.exception)) def testPackInvalidAlign(self): """Test detection of an offset that does not match its alignment""" with self.assertRaises(ValueError) as e: - self._DoTestFile('12_pack_inv_align.dts') + self._DoTestFile('012_pack_inv_align.dts') self.assertIn("Node '/binman/u-boot': Offset 0x5 (5) does not match " "align 0x4 (4)", str(e.exception)) def testPackInvalidSizeAlign(self): """Test that invalid entry size alignment is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('13_pack_inv_size_align.dts') + self._DoTestFile('013_pack_inv_size_align.dts') self.assertIn("Node '/binman/u-boot': Size 0x5 (5) does not match " "align-size 0x4 (4)", str(e.exception)) def testPackOverlap(self): """Test that overlapping regions are detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('14_pack_overlap.dts') + self._DoTestFile('014_pack_overlap.dts') self.assertIn("Node '/binman/u-boot-align': Offset 0x3 (3) overlaps " "with previous entry '/binman/u-boot' ending at 0x4 (4)", str(e.exception)) @@ -682,20 +682,20 @@ class TestFunctional(unittest.TestCase): def testPackEntryOverflow(self): """Test that entries that overflow their size are detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('15_pack_overflow.dts') + self._DoTestFile('015_pack_overflow.dts') self.assertIn("Node '/binman/u-boot': Entry contents size is 0x4 (4) " "but entry size is 0x3 (3)", str(e.exception)) def testPackImageOverflow(self): """Test that entries which overflow the image size are detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('16_pack_image_overflow.dts') + self._DoTestFile('016_pack_image_overflow.dts') self.assertIn("Section '/binman': contents size 0x4 (4) exceeds section " "size 0x3 (3)", str(e.exception)) def testPackImageSize(self): """Test that the image size can be set""" - retcode = self._DoTestFile('17_pack_image_size.dts') + retcode = self._DoTestFile('017_pack_image_size.dts') self.assertEqual(0, retcode) self.assertIn('image', control.images) image = control.images['image'] @@ -703,7 +703,7 @@ class TestFunctional(unittest.TestCase): def testPackImageSizeAlign(self): """Test that image size alignemnt works as expected""" - retcode = self._DoTestFile('18_pack_image_align.dts') + retcode = self._DoTestFile('018_pack_image_align.dts') self.assertEqual(0, retcode) self.assertIn('image', control.images) image = control.images['image'] @@ -712,26 +712,26 @@ class TestFunctional(unittest.TestCase): def testPackInvalidImageAlign(self): """Test that invalid image alignment is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('19_pack_inv_image_align.dts') + self._DoTestFile('019_pack_inv_image_align.dts') self.assertIn("Section '/binman': Size 0x7 (7) does not match " "align-size 0x8 (8)", str(e.exception)) def testPackAlignPowerOf2(self): """Test that invalid image alignment is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('20_pack_inv_image_align_power2.dts') + self._DoTestFile('020_pack_inv_image_align_power2.dts') self.assertIn("Section '/binman': Alignment size 131 must be a power of " "two", str(e.exception)) def testImagePadByte(self): """Test that the image pad byte can be specified""" self._SetupSplElf() - data = self._DoReadFile('21_image_pad.dts') + data = self._DoReadFile('021_image_pad.dts') self.assertEqual(U_BOOT_SPL_DATA + (chr(0xff) * 1) + U_BOOT_DATA, data) def testImageName(self): """Test that image files can be named""" - retcode = self._DoTestFile('22_image_name.dts') + retcode = self._DoTestFile('022_image_name.dts') self.assertEqual(0, retcode) image = control.images['image1'] fname = tools.GetOutputFilename('test-name') @@ -743,33 +743,33 @@ class TestFunctional(unittest.TestCase): def testBlobFilename(self): """Test that generic blobs can be provided by filename""" - data = self._DoReadFile('23_blob.dts') + data = self._DoReadFile('023_blob.dts') self.assertEqual(BLOB_DATA, data) def testPackSorted(self): """Test that entries can be sorted""" self._SetupSplElf() - data = self._DoReadFile('24_sorted.dts') + data = self._DoReadFile('024_sorted.dts') self.assertEqual(chr(0) * 1 + U_BOOT_SPL_DATA + chr(0) * 2 + U_BOOT_DATA, data) def testPackZeroOffset(self): """Test that an entry at offset 0 is not given a new offset""" with self.assertRaises(ValueError) as e: - self._DoTestFile('25_pack_zero_size.dts') + self._DoTestFile('025_pack_zero_size.dts') self.assertIn("Node '/binman/u-boot-spl': Offset 0x0 (0) overlaps " "with previous entry '/binman/u-boot' ending at 0x4 (4)", str(e.exception)) def testPackUbootDtb(self): """Test that a device tree can be added to U-Boot""" - data = self._DoReadFile('26_pack_u_boot_dtb.dts') + data = self._DoReadFile('026_pack_u_boot_dtb.dts') self.assertEqual(U_BOOT_NODTB_DATA + U_BOOT_DTB_DATA, data) def testPackX86RomNoSize(self): """Test that the end-at-4gb property requires a size property""" with self.assertRaises(ValueError) as e: - self._DoTestFile('27_pack_4gb_no_size.dts') + self._DoTestFile('027_pack_4gb_no_size.dts') self.assertIn("Section '/binman': Section size must be provided when " "using end-at-4gb", str(e.exception)) @@ -784,7 +784,7 @@ class TestFunctional(unittest.TestCase): def testPackX86RomOutside(self): """Test that the end-at-4gb property checks for offset boundaries""" with self.assertRaises(ValueError) as e: - self._DoTestFile('28_pack_4gb_outside.dts') + self._DoTestFile('028_pack_4gb_outside.dts') self.assertIn("Node '/binman/u-boot': Offset 0x0 (0) is outside " "the section starting at 0xffffffe0 (4294967264)", str(e.exception)) @@ -792,7 +792,7 @@ class TestFunctional(unittest.TestCase): def testPackX86Rom(self): """Test that a basic x86 ROM can be created""" self._SetupSplElf() - data = self._DoReadFile('29_x86-rom.dts') + data = self._DoReadFile('029_x86-rom.dts') self.assertEqual(U_BOOT_DATA + chr(0) * 7 + U_BOOT_SPL_DATA + chr(0) * 2, data) @@ -800,31 +800,31 @@ class TestFunctional(unittest.TestCase): """Test that an invalid Intel descriptor entry is detected""" TestFunctional._MakeInputFile('descriptor.bin', '') with self.assertRaises(ValueError) as e: - self._DoTestFile('31_x86-rom-me.dts') + self._DoTestFile('031_x86-rom-me.dts') self.assertIn("Node '/binman/intel-descriptor': Cannot find FD " "signature", str(e.exception)) def testPackX86RomBadDesc(self): """Test that the Intel requires a descriptor entry""" with self.assertRaises(ValueError) as e: - self._DoTestFile('30_x86-rom-me-no-desc.dts') + self._DoTestFile('030_x86-rom-me-no-desc.dts') self.assertIn("Node '/binman/intel-me': No offset set with " "offset-unset: should another entry provide this correct " "offset?", str(e.exception)) def testPackX86RomMe(self): """Test that an x86 ROM with an ME region can be created""" - data = self._DoReadFile('31_x86-rom-me.dts') + data = self._DoReadFile('031_x86-rom-me.dts') self.assertEqual(ME_DATA, data[0x1000:0x1000 + len(ME_DATA)]) def testPackVga(self): """Test that an image with a VGA binary can be created""" - data = self._DoReadFile('32_intel-vga.dts') + data = self._DoReadFile('032_intel-vga.dts') self.assertEqual(VGA_DATA, data[:len(VGA_DATA)]) def testPackStart16(self): """Test that an image with an x86 start16 region can be created""" - data = self._DoReadFile('33_x86-start16.dts') + data = self._DoReadFile('033_x86-start16.dts') self.assertEqual(X86_START16_DATA, data[:len(X86_START16_DATA)]) def testPackPowerpcMpc85xxBootpgResetvec(self): @@ -893,7 +893,7 @@ class TestFunctional(unittest.TestCase): u-boot.dtb with the microcode removed the microcode """ - first, pos_and_size = self._RunMicrocodeTest('34_x86_ucode.dts', + first, pos_and_size = self._RunMicrocodeTest('034_x86_ucode.dts', U_BOOT_NODTB_DATA) self.assertEqual('nodtb with microcode' + pos_and_size + ' somewhere in here', first) @@ -910,7 +910,7 @@ class TestFunctional(unittest.TestCase): # We need the libfdt library to run this test since only that allows # finding the offset of a property. This is required by # Entry_u_boot_dtb_with_ucode.ObtainContents(). - data = self._DoReadFile('35_x86_single_ucode.dts', True) + data = self._DoReadFile('035_x86_single_ucode.dts', True) second = data[len(U_BOOT_NODTB_DATA):] @@ -937,27 +937,27 @@ class TestFunctional(unittest.TestCase): def testUBootImg(self): """Test that u-boot.img can be put in a file""" - data = self._DoReadFile('36_u_boot_img.dts') + data = self._DoReadFile('036_u_boot_img.dts') self.assertEqual(U_BOOT_IMG_DATA, data) def testNoMicrocode(self): """Test that a missing microcode region is detected""" with self.assertRaises(ValueError) as e: - self._DoReadFile('37_x86_no_ucode.dts', True) + self._DoReadFile('037_x86_no_ucode.dts', True) self.assertIn("Node '/binman/u-boot-dtb-with-ucode': No /microcode " "node found in ", str(e.exception)) def testMicrocodeWithoutNode(self): """Test that a missing u-boot-dtb-with-ucode node is detected""" with self.assertRaises(ValueError) as e: - self._DoReadFile('38_x86_ucode_missing_node.dts', True) + self._DoReadFile('038_x86_ucode_missing_node.dts', True) self.assertIn("Node '/binman/u-boot-with-ucode-ptr': Cannot find " "microcode region u-boot-dtb-with-ucode", str(e.exception)) def testMicrocodeWithoutNode2(self): """Test that a missing u-boot-ucode node is detected""" with self.assertRaises(ValueError) as e: - self._DoReadFile('39_x86_ucode_missing_node2.dts', True) + self._DoReadFile('039_x86_ucode_missing_node2.dts', True) self.assertIn("Node '/binman/u-boot-with-ucode-ptr': Cannot find " "microcode region u-boot-ucode", str(e.exception)) @@ -981,7 +981,7 @@ class TestFunctional(unittest.TestCase): def testMicrocodeNotInImage(self): """Test that microcode must be placed within the image""" with self.assertRaises(ValueError) as e: - self._DoReadFile('40_x86_ucode_not_in_image.dts', True) + self._DoReadFile('040_x86_ucode_not_in_image.dts', True) self.assertIn("Node '/binman/u-boot-with-ucode-ptr': Microcode " "pointer _dt_ucode_base_size at fffffe14 is outside the " "section ranging from 00000000 to 0000002e", str(e.exception)) @@ -990,7 +990,7 @@ class TestFunctional(unittest.TestCase): """Test that we can cope with an image without microcode (e.g. qemu)""" with open(self.TestFile('u_boot_no_ucode_ptr')) as fd: TestFunctional._MakeInputFile('u-boot', fd.read()) - data, dtb, _, _ = self._DoReadFileDtb('44_x86_optional_ucode.dts', True) + data, dtb, _, _ = self._DoReadFileDtb('044_x86_optional_ucode.dts', True) # Now check the device tree has no microcode self.assertEqual(U_BOOT_NODTB_DATA, data[:len(U_BOOT_NODTB_DATA)]) @@ -1006,43 +1006,43 @@ class TestFunctional(unittest.TestCase): def testUnknownPosSize(self): """Test that microcode must be placed within the image""" with self.assertRaises(ValueError) as e: - self._DoReadFile('41_unknown_pos_size.dts', True) + self._DoReadFile('041_unknown_pos_size.dts', True) self.assertIn("Section '/binman': Unable to set offset/size for unknown " "entry 'invalid-entry'", str(e.exception)) def testPackFsp(self): """Test that an image with a FSP binary can be created""" - data = self._DoReadFile('42_intel-fsp.dts') + data = self._DoReadFile('042_intel-fsp.dts') self.assertEqual(FSP_DATA, data[:len(FSP_DATA)]) def testPackCmc(self): """Test that an image with a CMC binary can be created""" - data = self._DoReadFile('43_intel-cmc.dts') + data = self._DoReadFile('043_intel-cmc.dts') self.assertEqual(CMC_DATA, data[:len(CMC_DATA)]) def testPackVbt(self): """Test that an image with a VBT binary can be created""" - data = self._DoReadFile('46_intel-vbt.dts') + data = self._DoReadFile('046_intel-vbt.dts') self.assertEqual(VBT_DATA, data[:len(VBT_DATA)]) def testSplBssPad(self): """Test that we can pad SPL's BSS with zeros""" # ELF file with a '__bss_size' symbol self._SetupSplElf() - data = self._DoReadFile('47_spl_bss_pad.dts') + data = self._DoReadFile('047_spl_bss_pad.dts') self.assertEqual(U_BOOT_SPL_DATA + (chr(0) * 10) + U_BOOT_DATA, data) def testSplBssPadMissing(self): """Test that a missing symbol is detected""" self._SetupSplElf('u_boot_ucode_ptr') with self.assertRaises(ValueError) as e: - self._DoReadFile('47_spl_bss_pad.dts') + self._DoReadFile('047_spl_bss_pad.dts') self.assertIn('Expected __bss_size symbol in spl/u-boot-spl', str(e.exception)) def testPackStart16Spl(self): """Test that an image with an x86 start16 SPL region can be created""" - data = self._DoReadFile('48_x86-start16-spl.dts') + data = self._DoReadFile('048_x86-start16-spl.dts') self.assertEqual(X86_START16_SPL_DATA, data[:len(X86_START16_SPL_DATA)]) def _PackUbootSplMicrocode(self, dts, ucode_second=False): @@ -1067,7 +1067,7 @@ class TestFunctional(unittest.TestCase): def testPackUbootSplMicrocode(self): """Test that x86 microcode can be handled correctly in SPL""" - self._PackUbootSplMicrocode('49_x86_ucode_spl.dts') + self._PackUbootSplMicrocode('049_x86_ucode_spl.dts') def testPackUbootSplMicrocodeReorder(self): """Test that order doesn't matter for microcode entries @@ -1076,22 +1076,22 @@ class TestFunctional(unittest.TestCase): u-boot-ucode entry we have not yet seen the u-boot-dtb-with-ucode entry, so we reply on binman to try later. """ - self._PackUbootSplMicrocode('58_x86_ucode_spl_needs_retry.dts', + self._PackUbootSplMicrocode('058_x86_ucode_spl_needs_retry.dts', ucode_second=True) def testPackMrc(self): """Test that an image with an MRC binary can be created""" - data = self._DoReadFile('50_intel_mrc.dts') + data = self._DoReadFile('050_intel_mrc.dts') self.assertEqual(MRC_DATA, data[:len(MRC_DATA)]) def testSplDtb(self): """Test that an image with spl/u-boot-spl.dtb can be created""" - data = self._DoReadFile('51_u_boot_spl_dtb.dts') + data = self._DoReadFile('051_u_boot_spl_dtb.dts') self.assertEqual(U_BOOT_SPL_DTB_DATA, data[:len(U_BOOT_SPL_DTB_DATA)]) def testSplNoDtb(self): """Test that an image with spl/u-boot-spl-nodtb.bin can be created""" - data = self._DoReadFile('52_u_boot_spl_nodtb.dts') + data = self._DoReadFile('052_u_boot_spl_nodtb.dts') self.assertEqual(U_BOOT_SPL_NODTB_DATA, data[:len(U_BOOT_SPL_NODTB_DATA)]) def testSymbols(self): @@ -1102,7 +1102,7 @@ class TestFunctional(unittest.TestCase): self.assertEqual(syms['_binman_u_boot_spl_prop_offset'].address, addr) self._SetupSplElf('u_boot_binman_syms') - data = self._DoReadFile('53_symbols.dts') + data = self._DoReadFile('053_symbols.dts') sym_values = struct.pack('; + #size-cells = <1>; diff --git a/tools/binman/test/002_missing_node.dts b/tools/binman/test/002_missing_node.dts new file mode 100644 index 00000000000..3a51ec2be58 --- /dev/null +++ b/tools/binman/test/002_missing_node.dts @@ -0,0 +1,6 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; +}; diff --git a/tools/binman/test/003_empty.dts b/tools/binman/test/003_empty.dts new file mode 100644 index 00000000000..493c9a04c97 --- /dev/null +++ b/tools/binman/test/003_empty.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + }; +}; diff --git a/tools/binman/test/004_invalid_entry.dts b/tools/binman/test/004_invalid_entry.dts new file mode 100644 index 00000000000..b043455bb57 --- /dev/null +++ b/tools/binman/test/004_invalid_entry.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + not-a-valid-type { + }; + }; +}; diff --git a/tools/binman/test/005_simple.dts b/tools/binman/test/005_simple.dts new file mode 100644 index 00000000000..3771aa2261c --- /dev/null +++ b/tools/binman/test/005_simple.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + }; +}; diff --git a/tools/binman/test/006_dual_image.dts b/tools/binman/test/006_dual_image.dts new file mode 100644 index 00000000000..78be16f1649 --- /dev/null +++ b/tools/binman/test/006_dual_image.dts @@ -0,0 +1,22 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + multiple-images; + image1 { + u-boot { + }; + }; + + image2 { + pad-before = <3>; + pad-after = <5>; + + u-boot { + }; + }; + }; +}; diff --git a/tools/binman/test/007_bad_align.dts b/tools/binman/test/007_bad_align.dts new file mode 100644 index 00000000000..123bb135581 --- /dev/null +++ b/tools/binman/test/007_bad_align.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + align = <23>; + }; + }; +}; diff --git a/tools/binman/test/008_pack.dts b/tools/binman/test/008_pack.dts new file mode 100644 index 00000000000..a88785d8352 --- /dev/null +++ b/tools/binman/test/008_pack.dts @@ -0,0 +1,30 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + + u-boot-align { + type = "u-boot"; + align = <16>; + }; + + u-boot-size { + type = "u-boot"; + size = <23>; + }; + + u-boot-next { + type = "u-boot"; + }; + + u-boot-fixed { + type = "u-boot"; + offset = <61>; + }; + }; +}; diff --git a/tools/binman/test/009_pack_extra.dts b/tools/binman/test/009_pack_extra.dts new file mode 100644 index 00000000000..0765707dea2 --- /dev/null +++ b/tools/binman/test/009_pack_extra.dts @@ -0,0 +1,35 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + pad-before = <3>; + pad-after = <5>; + }; + + u-boot-align-size-nop { + type = "u-boot"; + align-size = <4>; + }; + + u-boot-align-size { + type = "u-boot"; + align = <16>; + align-size = <32>; + }; + + u-boot-align-end { + type = "u-boot"; + align-end = <64>; + }; + + u-boot-align-both { + type = "u-boot"; + align= <64>; + align-end = <128>; + }; + }; +}; diff --git a/tools/binman/test/010_pack_align_power2.dts b/tools/binman/test/010_pack_align_power2.dts new file mode 100644 index 00000000000..8f6253a3d0f --- /dev/null +++ b/tools/binman/test/010_pack_align_power2.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + align = <5>; + }; + }; +}; diff --git a/tools/binman/test/011_pack_align_size_power2.dts b/tools/binman/test/011_pack_align_size_power2.dts new file mode 100644 index 00000000000..04f7672ea47 --- /dev/null +++ b/tools/binman/test/011_pack_align_size_power2.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + align-size = <55>; + }; + }; +}; diff --git a/tools/binman/test/012_pack_inv_align.dts b/tools/binman/test/012_pack_inv_align.dts new file mode 100644 index 00000000000..d8dd600edb8 --- /dev/null +++ b/tools/binman/test/012_pack_inv_align.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + offset = <5>; + align = <4>; + }; + }; +}; diff --git a/tools/binman/test/013_pack_inv_size_align.dts b/tools/binman/test/013_pack_inv_size_align.dts new file mode 100644 index 00000000000..dfafa134d7b --- /dev/null +++ b/tools/binman/test/013_pack_inv_size_align.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + size = <5>; + align-size = <4>; + }; + }; +}; diff --git a/tools/binman/test/014_pack_overlap.dts b/tools/binman/test/014_pack_overlap.dts new file mode 100644 index 00000000000..3895cba3bdb --- /dev/null +++ b/tools/binman/test/014_pack_overlap.dts @@ -0,0 +1,16 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + + u-boot-align { + type = "u-boot"; + offset = <3>; + }; + }; +}; diff --git a/tools/binman/test/015_pack_overflow.dts b/tools/binman/test/015_pack_overflow.dts new file mode 100644 index 00000000000..6f654330afc --- /dev/null +++ b/tools/binman/test/015_pack_overflow.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + size = <3>; + }; + }; +}; diff --git a/tools/binman/test/016_pack_image_overflow.dts b/tools/binman/test/016_pack_image_overflow.dts new file mode 100644 index 00000000000..6ae66f3ac95 --- /dev/null +++ b/tools/binman/test/016_pack_image_overflow.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <3>; + + u-boot { + }; + }; +}; diff --git a/tools/binman/test/017_pack_image_size.dts b/tools/binman/test/017_pack_image_size.dts new file mode 100644 index 00000000000..2360eb5d19a --- /dev/null +++ b/tools/binman/test/017_pack_image_size.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <7>; + + u-boot { + }; + }; +}; diff --git a/tools/binman/test/018_pack_image_align.dts b/tools/binman/test/018_pack_image_align.dts new file mode 100644 index 00000000000..16cd2a422ef --- /dev/null +++ b/tools/binman/test/018_pack_image_align.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + align-size = <16>; + + u-boot { + }; + }; +}; diff --git a/tools/binman/test/019_pack_inv_image_align.dts b/tools/binman/test/019_pack_inv_image_align.dts new file mode 100644 index 00000000000..e5ee87b88fb --- /dev/null +++ b/tools/binman/test/019_pack_inv_image_align.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <7>; + align-size = <8>; + + u-boot { + }; + }; +}; diff --git a/tools/binman/test/01_invalid.dts b/tools/binman/test/01_invalid.dts deleted file mode 100644 index 7d00455d7c1..00000000000 --- a/tools/binman/test/01_invalid.dts +++ /dev/null @@ -1,5 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; diff --git a/tools/binman/test/020_pack_inv_image_align_power2.dts b/tools/binman/test/020_pack_inv_image_align_power2.dts new file mode 100644 index 00000000000..a428c4be520 --- /dev/null +++ b/tools/binman/test/020_pack_inv_image_align_power2.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + align-size = <131>; + + u-boot { + }; + }; +}; diff --git a/tools/binman/test/021_image_pad.dts b/tools/binman/test/021_image_pad.dts new file mode 100644 index 00000000000..c6516689d94 --- /dev/null +++ b/tools/binman/test/021_image_pad.dts @@ -0,0 +1,16 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pad-byte = <0xff>; + u-boot-spl { + }; + + u-boot { + offset = <20>; + }; + }; +}; diff --git a/tools/binman/test/022_image_name.dts b/tools/binman/test/022_image_name.dts new file mode 100644 index 00000000000..94fc069c176 --- /dev/null +++ b/tools/binman/test/022_image_name.dts @@ -0,0 +1,21 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + multiple-images; + image1 { + filename = "test-name"; + u-boot { + }; + }; + + image2 { + filename = "test-name.xx"; + u-boot { + }; + }; + }; +}; diff --git a/tools/binman/test/023_blob.dts b/tools/binman/test/023_blob.dts new file mode 100644 index 00000000000..7dcff69666a --- /dev/null +++ b/tools/binman/test/023_blob.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + blob { + filename = "blobfile"; + }; + }; +}; diff --git a/tools/binman/test/024_sorted.dts b/tools/binman/test/024_sorted.dts new file mode 100644 index 00000000000..d35d39f077d --- /dev/null +++ b/tools/binman/test/024_sorted.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + u-boot { + offset = <22>; + }; + + u-boot-spl { + offset = <1>; + }; + }; +}; diff --git a/tools/binman/test/025_pack_zero_size.dts b/tools/binman/test/025_pack_zero_size.dts new file mode 100644 index 00000000000..e863c44e3fd --- /dev/null +++ b/tools/binman/test/025_pack_zero_size.dts @@ -0,0 +1,15 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + + u-boot-spl { + offset = <0>; + }; + }; +}; diff --git a/tools/binman/test/026_pack_u_boot_dtb.dts b/tools/binman/test/026_pack_u_boot_dtb.dts new file mode 100644 index 00000000000..2707a7347a4 --- /dev/null +++ b/tools/binman/test/026_pack_u_boot_dtb.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot-nodtb { + }; + + u-boot-dtb { + }; + }; +}; diff --git a/tools/binman/test/027_pack_4gb_no_size.dts b/tools/binman/test/027_pack_4gb_no_size.dts new file mode 100644 index 00000000000..371cca10d58 --- /dev/null +++ b/tools/binman/test/027_pack_4gb_no_size.dts @@ -0,0 +1,18 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + u-boot { + offset = <0xfffffff0>; + }; + + u-boot-spl { + offset = <0xfffffff7>; + }; + }; +}; diff --git a/tools/binman/test/028_pack_4gb_outside.dts b/tools/binman/test/028_pack_4gb_outside.dts new file mode 100644 index 00000000000..2216abfb70c --- /dev/null +++ b/tools/binman/test/028_pack_4gb_outside.dts @@ -0,0 +1,19 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <32>; + u-boot { + offset = <0>; + }; + + u-boot-spl { + offset = <0xffffffeb>; + }; + }; +}; diff --git a/tools/binman/test/029_x86-rom.dts b/tools/binman/test/029_x86-rom.dts new file mode 100644 index 00000000000..d5c69f9d4a9 --- /dev/null +++ b/tools/binman/test/029_x86-rom.dts @@ -0,0 +1,19 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <32>; + u-boot { + offset = <0xffffffe0>; + }; + + u-boot-spl { + offset = <0xffffffeb>; + }; + }; +}; diff --git a/tools/binman/test/02_missing_node.dts b/tools/binman/test/02_missing_node.dts deleted file mode 100644 index 3a51ec2be58..00000000000 --- a/tools/binman/test/02_missing_node.dts +++ /dev/null @@ -1,6 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; -}; diff --git a/tools/binman/test/030_x86-rom-me-no-desc.dts b/tools/binman/test/030_x86-rom-me-no-desc.dts new file mode 100644 index 00000000000..796cb87afc7 --- /dev/null +++ b/tools/binman/test/030_x86-rom-me-no-desc.dts @@ -0,0 +1,16 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <16>; + intel-me { + filename = "me.bin"; + offset-unset; + }; + }; +}; diff --git a/tools/binman/test/031_x86-rom-me.dts b/tools/binman/test/031_x86-rom-me.dts new file mode 100644 index 00000000000..b8b0a5a74bb --- /dev/null +++ b/tools/binman/test/031_x86-rom-me.dts @@ -0,0 +1,20 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x800000>; + intel-descriptor { + filename = "descriptor.bin"; + }; + + intel-me { + filename = "me.bin"; + offset-unset; + }; + }; +}; diff --git a/tools/binman/test/032_intel-vga.dts b/tools/binman/test/032_intel-vga.dts new file mode 100644 index 00000000000..9c532d03d3c --- /dev/null +++ b/tools/binman/test/032_intel-vga.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + intel-vga { + filename = "vga.bin"; + }; + }; +}; diff --git a/tools/binman/test/033_x86-start16.dts b/tools/binman/test/033_x86-start16.dts new file mode 100644 index 00000000000..2e279dee9d6 --- /dev/null +++ b/tools/binman/test/033_x86-start16.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + x86-start16 { + }; + }; +}; diff --git a/tools/binman/test/034_x86_ucode.dts b/tools/binman/test/034_x86_ucode.dts new file mode 100644 index 00000000000..40725731cd3 --- /dev/null +++ b/tools/binman/test/034_x86_ucode.dts @@ -0,0 +1,29 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-with-ucode-ptr { + }; + + u-boot-dtb-with-ucode { + }; + + u-boot-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/035_x86_single_ucode.dts b/tools/binman/test/035_x86_single_ucode.dts new file mode 100644 index 00000000000..2b1f086a41c --- /dev/null +++ b/tools/binman/test/035_x86_single_ucode.dts @@ -0,0 +1,26 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-with-ucode-ptr { + }; + + u-boot-dtb-with-ucode { + }; + + u-boot-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + }; +}; diff --git a/tools/binman/test/036_u_boot_img.dts b/tools/binman/test/036_u_boot_img.dts new file mode 100644 index 00000000000..aa5a3fe4810 --- /dev/null +++ b/tools/binman/test/036_u_boot_img.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot-img { + }; + }; +}; diff --git a/tools/binman/test/037_x86_no_ucode.dts b/tools/binman/test/037_x86_no_ucode.dts new file mode 100644 index 00000000000..6da49c3da6d --- /dev/null +++ b/tools/binman/test/037_x86_no_ucode.dts @@ -0,0 +1,20 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-with-ucode-ptr { + }; + + u-boot-dtb-with-ucode { + }; + + u-boot-ucode { + }; + }; +}; diff --git a/tools/binman/test/038_x86_ucode_missing_node.dts b/tools/binman/test/038_x86_ucode_missing_node.dts new file mode 100644 index 00000000000..720677c9c1e --- /dev/null +++ b/tools/binman/test/038_x86_ucode_missing_node.dts @@ -0,0 +1,26 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-with-ucode-ptr { + }; + + u-boot-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/039_x86_ucode_missing_node2.dts b/tools/binman/test/039_x86_ucode_missing_node2.dts new file mode 100644 index 00000000000..10ac086d549 --- /dev/null +++ b/tools/binman/test/039_x86_ucode_missing_node2.dts @@ -0,0 +1,23 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-with-ucode-ptr { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/03_empty.dts b/tools/binman/test/03_empty.dts deleted file mode 100644 index 493c9a04c97..00000000000 --- a/tools/binman/test/03_empty.dts +++ /dev/null @@ -1,9 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - }; -}; diff --git a/tools/binman/test/040_x86_ucode_not_in_image.dts b/tools/binman/test/040_x86_ucode_not_in_image.dts new file mode 100644 index 00000000000..609725824a5 --- /dev/null +++ b/tools/binman/test/040_x86_ucode_not_in_image.dts @@ -0,0 +1,28 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + size = <0x200>; + u-boot-with-ucode-ptr { + }; + + u-boot-dtb-with-ucode { + }; + + u-boot-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/041_unknown_pos_size.dts b/tools/binman/test/041_unknown_pos_size.dts new file mode 100644 index 00000000000..94fe821c470 --- /dev/null +++ b/tools/binman/test/041_unknown_pos_size.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + _testing { + return-invalid-entry; + }; + }; +}; diff --git a/tools/binman/test/042_intel-fsp.dts b/tools/binman/test/042_intel-fsp.dts new file mode 100644 index 00000000000..8a7c889251b --- /dev/null +++ b/tools/binman/test/042_intel-fsp.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + intel-fsp { + filename = "fsp.bin"; + }; + }; +}; diff --git a/tools/binman/test/043_intel-cmc.dts b/tools/binman/test/043_intel-cmc.dts new file mode 100644 index 00000000000..5a56c7d881a --- /dev/null +++ b/tools/binman/test/043_intel-cmc.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + intel-cmc { + filename = "cmc.bin"; + }; + }; +}; diff --git a/tools/binman/test/044_x86_optional_ucode.dts b/tools/binman/test/044_x86_optional_ucode.dts new file mode 100644 index 00000000000..24a7040d318 --- /dev/null +++ b/tools/binman/test/044_x86_optional_ucode.dts @@ -0,0 +1,30 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-with-ucode-ptr { + optional-ucode; + }; + + u-boot-dtb-with-ucode { + }; + + u-boot-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/045_prop_test.dts b/tools/binman/test/045_prop_test.dts new file mode 100644 index 00000000000..064de2b3167 --- /dev/null +++ b/tools/binman/test/045_prop_test.dts @@ -0,0 +1,23 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <16>; + intel-me { + filename = "me.bin"; + offset-unset; + intval = <3>; + intarray = <5 6>; + byteval = [08]; + bytearray = [01 23 34]; + longbytearray = [09 0a 0b 0c]; + stringval = "message2"; + stringarray = "another", "multi-word", "message"; + }; + }; +}; diff --git a/tools/binman/test/046_intel-vbt.dts b/tools/binman/test/046_intel-vbt.dts new file mode 100644 index 00000000000..733f5751d5a --- /dev/null +++ b/tools/binman/test/046_intel-vbt.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + intel-vbt { + filename = "vbt.bin"; + }; + }; +}; diff --git a/tools/binman/test/047_spl_bss_pad.dts b/tools/binman/test/047_spl_bss_pad.dts new file mode 100644 index 00000000000..6bd88b83f98 --- /dev/null +++ b/tools/binman/test/047_spl_bss_pad.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot-spl { + }; + + u-boot-spl-bss-pad { + }; + + u-boot { + }; + }; +}; diff --git a/tools/binman/test/048_x86-start16-spl.dts b/tools/binman/test/048_x86-start16-spl.dts new file mode 100644 index 00000000000..e2009f15f05 --- /dev/null +++ b/tools/binman/test/048_x86-start16-spl.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + x86-start16-spl { + }; + }; +}; diff --git a/tools/binman/test/049_x86_ucode_spl.dts b/tools/binman/test/049_x86_ucode_spl.dts new file mode 100644 index 00000000000..350d2c4730b --- /dev/null +++ b/tools/binman/test/049_x86_ucode_spl.dts @@ -0,0 +1,29 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-spl-with-ucode-ptr { + }; + + u-boot-dtb-with-ucode { + }; + + u-boot-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/04_invalid_entry.dts b/tools/binman/test/04_invalid_entry.dts deleted file mode 100644 index b043455bb57..00000000000 --- a/tools/binman/test/04_invalid_entry.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - not-a-valid-type { - }; - }; -}; diff --git a/tools/binman/test/050_intel_mrc.dts b/tools/binman/test/050_intel_mrc.dts new file mode 100644 index 00000000000..54cd52a2b71 --- /dev/null +++ b/tools/binman/test/050_intel_mrc.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + intel-mrc { + }; + }; +}; diff --git a/tools/binman/test/051_u_boot_spl_dtb.dts b/tools/binman/test/051_u_boot_spl_dtb.dts new file mode 100644 index 00000000000..3912f86b4cd --- /dev/null +++ b/tools/binman/test/051_u_boot_spl_dtb.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + u-boot-spl-dtb { + }; + }; +}; diff --git a/tools/binman/test/052_u_boot_spl_nodtb.dts b/tools/binman/test/052_u_boot_spl_nodtb.dts new file mode 100644 index 00000000000..7f4e27780fe --- /dev/null +++ b/tools/binman/test/052_u_boot_spl_nodtb.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot-spl-nodtb { + }; + }; +}; diff --git a/tools/binman/test/053_symbols.dts b/tools/binman/test/053_symbols.dts new file mode 100644 index 00000000000..9f135676cb0 --- /dev/null +++ b/tools/binman/test/053_symbols.dts @@ -0,0 +1,20 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pad-byte = <0xff>; + u-boot-spl { + }; + + u-boot { + offset = <20>; + }; + + u-boot-spl2 { + type = "u-boot-spl"; + }; + }; +}; diff --git a/tools/binman/test/054_unit_address.dts b/tools/binman/test/054_unit_address.dts new file mode 100644 index 00000000000..3216dbbcc19 --- /dev/null +++ b/tools/binman/test/054_unit_address.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot@0 { + }; + u-boot@1 { + }; + }; +}; diff --git a/tools/binman/test/055_sections.dts b/tools/binman/test/055_sections.dts new file mode 100644 index 00000000000..6b306aeda46 --- /dev/null +++ b/tools/binman/test/055_sections.dts @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pad-byte = <0x26>; + size = <0x28>; + section@0 { + read-only; + size = <0x10>; + pad-byte = <0x21>; + + u-boot { + }; + }; + section@1 { + size = <0x10>; + pad-byte = <0x61>; + + u-boot { + }; + }; + section@2 { + u-boot { + }; + }; + }; +}; diff --git a/tools/binman/test/056_name_prefix.dts b/tools/binman/test/056_name_prefix.dts new file mode 100644 index 00000000000..f38c80eb183 --- /dev/null +++ b/tools/binman/test/056_name_prefix.dts @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pad-byte = <0x26>; + size = <0x28>; + section@0 { + read-only; + name-prefix = "ro-"; + size = <0x10>; + pad-byte = <0x21>; + + u-boot { + }; + }; + section@1 { + name-prefix = "rw-"; + size = <0x10>; + pad-byte = <0x61>; + + u-boot { + }; + }; + }; +}; diff --git a/tools/binman/test/057_unknown_contents.dts b/tools/binman/test/057_unknown_contents.dts new file mode 100644 index 00000000000..6ea98d7cab6 --- /dev/null +++ b/tools/binman/test/057_unknown_contents.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + _testing { + return-unknown-contents; + }; + }; +}; diff --git a/tools/binman/test/058_x86_ucode_spl_needs_retry.dts b/tools/binman/test/058_x86_ucode_spl_needs_retry.dts new file mode 100644 index 00000000000..a04adaaf7ba --- /dev/null +++ b/tools/binman/test/058_x86_ucode_spl_needs_retry.dts @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-spl-with-ucode-ptr { + }; + + /* + * Microcode goes before the DTB which contains it, so binman + * will need to obtain the contents of the next section before + * obtaining the contents of this one. + */ + u-boot-ucode { + }; + + u-boot-dtb-with-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/059_change_size.dts b/tools/binman/test/059_change_size.dts new file mode 100644 index 00000000000..1a69026a64c --- /dev/null +++ b/tools/binman/test/059_change_size.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + _testing { + bad-update-contents; + }; + }; +}; diff --git a/tools/binman/test/05_simple.dts b/tools/binman/test/05_simple.dts deleted file mode 100644 index 3771aa2261c..00000000000 --- a/tools/binman/test/05_simple.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - }; - }; -}; diff --git a/tools/binman/test/060_fdt_update.dts b/tools/binman/test/060_fdt_update.dts new file mode 100644 index 00000000000..f53c8a5053e --- /dev/null +++ b/tools/binman/test/060_fdt_update.dts @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pad-byte = <0x26>; + size = <0x28>; + section@0 { + read-only; + name-prefix = "ro-"; + size = <0x10>; + pad-byte = <0x21>; + + u-boot { + }; + }; + section@1 { + name-prefix = "rw-"; + size = <0x10>; + pad-byte = <0x61>; + + u-boot { + }; + }; + _testing { + }; + }; +}; diff --git a/tools/binman/test/061_fdt_update_bad.dts b/tools/binman/test/061_fdt_update_bad.dts new file mode 100644 index 00000000000..e5abf31699c --- /dev/null +++ b/tools/binman/test/061_fdt_update_bad.dts @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pad-byte = <0x26>; + size = <0x28>; + section@0 { + read-only; + name-prefix = "ro-"; + size = <0x10>; + pad-byte = <0x21>; + + u-boot { + }; + }; + section@1 { + name-prefix = "rw-"; + size = <0x10>; + pad-byte = <0x61>; + + u-boot { + }; + }; + _testing { + never-complete-process-fdt; + }; + }; +}; diff --git a/tools/binman/test/062_entry_args.dts b/tools/binman/test/062_entry_args.dts new file mode 100644 index 00000000000..4d4f102d60c --- /dev/null +++ b/tools/binman/test/062_entry_args.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + _testing { + test-str-fdt = "test0"; + test-int-fdt = <123>; + }; + }; +}; diff --git a/tools/binman/test/063_entry_args_missing.dts b/tools/binman/test/063_entry_args_missing.dts new file mode 100644 index 00000000000..1644e2fef3a --- /dev/null +++ b/tools/binman/test/063_entry_args_missing.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + _testing { + test-str-fdt = "test0"; + }; + }; +}; diff --git a/tools/binman/test/064_entry_args_required.dts b/tools/binman/test/064_entry_args_required.dts new file mode 100644 index 00000000000..705be100691 --- /dev/null +++ b/tools/binman/test/064_entry_args_required.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + _testing { + require-args; + test-str-fdt = "test0"; + }; + }; +}; diff --git a/tools/binman/test/065_entry_args_unknown_datatype.dts b/tools/binman/test/065_entry_args_unknown_datatype.dts new file mode 100644 index 00000000000..3e4838f4fff --- /dev/null +++ b/tools/binman/test/065_entry_args_unknown_datatype.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + _testing { + test-str-fdt = "test0"; + test-int-fdt = <123>; + force-bad-datatype; + }; + }; +}; diff --git a/tools/binman/test/066_text.dts b/tools/binman/test/066_text.dts new file mode 100644 index 00000000000..59b1fed0ef8 --- /dev/null +++ b/tools/binman/test/066_text.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + text { + size = <8>; + text-label = "test-id"; + }; + text2 { + type = "text"; + text-label = "test-id2"; + }; + text3 { + type = "text"; + text-label = "test-id3"; + }; + /* This one does not use command-line args */ + text4 { + type = "text"; + text-label = "test-id4"; + test-id4 = "some text"; + }; + }; +}; diff --git a/tools/binman/test/067_fmap.dts b/tools/binman/test/067_fmap.dts new file mode 100644 index 00000000000..9c0e293ac83 --- /dev/null +++ b/tools/binman/test/067_fmap.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + section@0 { + read-only; + name-prefix = "ro-"; + size = <0x10>; + pad-byte = <0x21>; + + u-boot { + }; + }; + section@1 { + name-prefix = "rw-"; + size = <0x10>; + pad-byte = <0x61>; + + u-boot { + }; + }; + fmap { + }; + }; +}; diff --git a/tools/binman/test/068_blob_named_by_arg.dts b/tools/binman/test/068_blob_named_by_arg.dts new file mode 100644 index 00000000000..e129f843cd5 --- /dev/null +++ b/tools/binman/test/068_blob_named_by_arg.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + cros-ec-rw { + }; + }; +}; diff --git a/tools/binman/test/069_fill.dts b/tools/binman/test/069_fill.dts new file mode 100644 index 00000000000..e372ea37aaa --- /dev/null +++ b/tools/binman/test/069_fill.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + fill { + size = <8>; + fill-byte = [ff]; + }; + }; +}; diff --git a/tools/binman/test/06_dual_image.dts b/tools/binman/test/06_dual_image.dts deleted file mode 100644 index 78be16f1649..00000000000 --- a/tools/binman/test/06_dual_image.dts +++ /dev/null @@ -1,22 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - multiple-images; - image1 { - u-boot { - }; - }; - - image2 { - pad-before = <3>; - pad-after = <5>; - - u-boot { - }; - }; - }; -}; diff --git a/tools/binman/test/070_fill_no_size.dts b/tools/binman/test/070_fill_no_size.dts new file mode 100644 index 00000000000..7b1fcf1b68b --- /dev/null +++ b/tools/binman/test/070_fill_no_size.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + fill { + fill-byte = [ff]; + }; + }; +}; diff --git a/tools/binman/test/071_gbb.dts b/tools/binman/test/071_gbb.dts new file mode 100644 index 00000000000..551756372af --- /dev/null +++ b/tools/binman/test/071_gbb.dts @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + gbb { + size = <0x2180>; + flags { + dev-screen-short-delay; + load-option-roms; + enable-alternate-os; + force-dev-switch-on; + force-dev-boot-usb; + disable-fw-rollback-check; + enter-triggers-tonorm; + force-dev-boot-legacy; + faft-key-override; + disable-ec-software-sync; + default-dev-boot-legacy; + disable-pd-software-sync; + disable-lid-shutdown; + force-dev-boot-fastboot-full-cap; + enable-serial; + disable-dwmp; + }; + }; + }; +}; diff --git a/tools/binman/test/072_gbb_too_small.dts b/tools/binman/test/072_gbb_too_small.dts new file mode 100644 index 00000000000..c088f36a1d0 --- /dev/null +++ b/tools/binman/test/072_gbb_too_small.dts @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + gbb { + size = <0x200>; + }; + }; +}; diff --git a/tools/binman/test/073_gbb_no_size.dts b/tools/binman/test/073_gbb_no_size.dts new file mode 100644 index 00000000000..83be4037852 --- /dev/null +++ b/tools/binman/test/073_gbb_no_size.dts @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + gbb { + }; + }; +}; diff --git a/tools/binman/test/074_vblock.dts b/tools/binman/test/074_vblock.dts new file mode 100644 index 00000000000..f0c21bfe9fc --- /dev/null +++ b/tools/binman/test/074_vblock.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u_boot: u-boot { + }; + + vblock { + content = <&u_boot &dtb>; + keyblock = "firmware.keyblock"; + signprivate = "firmware_data_key.vbprivk"; + version = <1>; + kernelkey = "kernel_subkey.vbpubk"; + preamble-flags = <1>; + }; + + /* + * Put this after the vblock so that its contents are not + * available when the vblock first tries to obtain its contents + */ + dtb: u-boot-dtb { + }; + }; +}; diff --git a/tools/binman/test/075_vblock_no_content.dts b/tools/binman/test/075_vblock_no_content.dts new file mode 100644 index 00000000000..676d9474b31 --- /dev/null +++ b/tools/binman/test/075_vblock_no_content.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u_boot: u-boot { + }; + + vblock { + keyblock = "firmware.keyblock"; + signprivate = "firmware_data_key.vbprivk"; + version = <1>; + kernelkey = "kernel_subkey.vbpubk"; + preamble-flags = <1>; + }; + + dtb: u-boot-dtb { + }; + }; +}; diff --git a/tools/binman/test/076_vblock_bad_phandle.dts b/tools/binman/test/076_vblock_bad_phandle.dts new file mode 100644 index 00000000000..ffbd0c335c3 --- /dev/null +++ b/tools/binman/test/076_vblock_bad_phandle.dts @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u_boot: u-boot { + }; + + vblock { + content = <1000>; + keyblock = "firmware.keyblock"; + signprivate = "firmware_data_key.vbprivk"; + version = <1>; + kernelkey = "kernel_subkey.vbpubk"; + preamble-flags = <1>; + }; + + dtb: u-boot-dtb { + }; + }; +}; diff --git a/tools/binman/test/077_vblock_bad_entry.dts b/tools/binman/test/077_vblock_bad_entry.dts new file mode 100644 index 00000000000..764c42a56e1 --- /dev/null +++ b/tools/binman/test/077_vblock_bad_entry.dts @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u_boot: u-boot { + }; + + vblock { + content = <&u_boot &other>; + keyblock = "firmware.keyblock"; + signprivate = "firmware_data_key.vbprivk"; + version = <1>; + kernelkey = "kernel_subkey.vbpubk"; + preamble-flags = <1>; + }; + + dtb: u-boot-dtb { + }; + }; + + other: other { + }; +}; diff --git a/tools/binman/test/078_u_boot_tpl.dts b/tools/binman/test/078_u_boot_tpl.dts new file mode 100644 index 00000000000..6c60b4c46f4 --- /dev/null +++ b/tools/binman/test/078_u_boot_tpl.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + u-boot-tpl { + }; + u-boot-tpl-dtb { + }; + }; +}; diff --git a/tools/binman/test/079_uses_pos.dts b/tools/binman/test/079_uses_pos.dts new file mode 100644 index 00000000000..7638b9b5e0c --- /dev/null +++ b/tools/binman/test/079_uses_pos.dts @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + u-boot { + pos = <10>; + }; + }; +}; diff --git a/tools/binman/test/07_bad_align.dts b/tools/binman/test/07_bad_align.dts deleted file mode 100644 index 123bb135581..00000000000 --- a/tools/binman/test/07_bad_align.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - align = <23>; - }; - }; -}; diff --git a/tools/binman/test/080_fill_empty.dts b/tools/binman/test/080_fill_empty.dts new file mode 100644 index 00000000000..2b78d3ae88d --- /dev/null +++ b/tools/binman/test/080_fill_empty.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + fill { + size = <0>; + fill-byte = [ff]; + }; + }; +}; diff --git a/tools/binman/test/081_x86-start16-tpl.dts b/tools/binman/test/081_x86-start16-tpl.dts new file mode 100644 index 00000000000..68e6bbd68f0 --- /dev/null +++ b/tools/binman/test/081_x86-start16-tpl.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + x86-start16-tpl { + }; + }; +}; diff --git a/tools/binman/test/082_fdt_update_all.dts b/tools/binman/test/082_fdt_update_all.dts new file mode 100644 index 00000000000..284975cc289 --- /dev/null +++ b/tools/binman/test/082_fdt_update_all.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + section { + u-boot-dtb { + }; + }; + u-boot-spl-dtb { + }; + u-boot-tpl-dtb { + }; + }; +}; diff --git a/tools/binman/test/083_compress.dts b/tools/binman/test/083_compress.dts new file mode 100644 index 00000000000..07813bdeaa3 --- /dev/null +++ b/tools/binman/test/083_compress.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + blob { + filename = "compress"; + compress = "lz4"; + }; + }; +}; diff --git a/tools/binman/test/084_files.dts b/tools/binman/test/084_files.dts new file mode 100644 index 00000000000..83ddb78f8e7 --- /dev/null +++ b/tools/binman/test/084_files.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + files { + pattern = "files/*.dat"; + compress = "none"; + }; + }; +}; diff --git a/tools/binman/test/085_files_compress.dts b/tools/binman/test/085_files_compress.dts new file mode 100644 index 00000000000..847b398bf2b --- /dev/null +++ b/tools/binman/test/085_files_compress.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + files { + pattern = "files/*.dat"; + compress = "lz4"; + }; + }; +}; diff --git a/tools/binman/test/086_files_none.dts b/tools/binman/test/086_files_none.dts new file mode 100644 index 00000000000..34bd92f224a --- /dev/null +++ b/tools/binman/test/086_files_none.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + files { + pattern = "files/*.none"; + compress = "none"; + require-matches; + }; + }; +}; diff --git a/tools/binman/test/087_files_no_pattern.dts b/tools/binman/test/087_files_no_pattern.dts new file mode 100644 index 00000000000..0cb5b469cb0 --- /dev/null +++ b/tools/binman/test/087_files_no_pattern.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + files { + compress = "none"; + require-matches; + }; + }; +}; diff --git a/tools/binman/test/088_expand_size.dts b/tools/binman/test/088_expand_size.dts new file mode 100644 index 00000000000..c8a01308ec5 --- /dev/null +++ b/tools/binman/test/088_expand_size.dts @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + size = <40>; + fill { + expand-size; + fill-byte = [61]; + size = <0>; + }; + u-boot { + offset = <8>; + }; + section { + expand-size; + pad-byte = <0x62>; + intel-mrc { + }; + }; + u-boot2 { + type = "u-boot"; + offset = <16>; + }; + section2 { + type = "section"; + fill { + expand-size; + fill-byte = [63]; + size = <0>; + }; + u-boot { + offset = <8>; + }; + }; + fill2 { + type = "fill"; + expand-size; + fill-byte = [64]; + size = <0>; + }; + }; +}; diff --git a/tools/binman/test/089_expand_size_bad.dts b/tools/binman/test/089_expand_size_bad.dts new file mode 100644 index 00000000000..edc0e5cf681 --- /dev/null +++ b/tools/binman/test/089_expand_size_bad.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + _testing { + expand-size; + return-contents-once; + }; + u-boot { + offset = <8>; + }; + }; +}; diff --git a/tools/binman/test/08_pack.dts b/tools/binman/test/08_pack.dts deleted file mode 100644 index a88785d8352..00000000000 --- a/tools/binman/test/08_pack.dts +++ /dev/null @@ -1,30 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - }; - - u-boot-align { - type = "u-boot"; - align = <16>; - }; - - u-boot-size { - type = "u-boot"; - size = <23>; - }; - - u-boot-next { - type = "u-boot"; - }; - - u-boot-fixed { - type = "u-boot"; - offset = <61>; - }; - }; -}; diff --git a/tools/binman/test/090_hash.dts b/tools/binman/test/090_hash.dts new file mode 100644 index 00000000000..200304599dc --- /dev/null +++ b/tools/binman/test/090_hash.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + u-boot { + hash { + algo = "sha256"; + }; + }; + }; +}; diff --git a/tools/binman/test/091_hash_no_algo.dts b/tools/binman/test/091_hash_no_algo.dts new file mode 100644 index 00000000000..b64df205117 --- /dev/null +++ b/tools/binman/test/091_hash_no_algo.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + u-boot { + hash { + }; + }; + }; +}; diff --git a/tools/binman/test/092_hash_bad_algo.dts b/tools/binman/test/092_hash_bad_algo.dts new file mode 100644 index 00000000000..d2402000db6 --- /dev/null +++ b/tools/binman/test/092_hash_bad_algo.dts @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + u-boot { + hash { + algo = "invalid"; + }; + }; + }; +}; diff --git a/tools/binman/test/093_x86_tpl_ucode.dts b/tools/binman/test/093_x86_tpl_ucode.dts new file mode 100644 index 00000000000..d7ed9fc66b8 --- /dev/null +++ b/tools/binman/test/093_x86_tpl_ucode.dts @@ -0,0 +1,29 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + sort-by-offset; + end-at-4gb; + size = <0x200>; + u-boot-tpl-with-ucode-ptr { + }; + + u-boot-tpl-dtb-with-ucode { + }; + + u-boot-ucode { + }; + }; + + microcode { + update@0 { + data = <0x12345678 0x12345679>; + }; + update@1 { + data = <0xabcd0000 0x78235609>; + }; + }; +}; diff --git a/tools/binman/test/094_fmap_x86.dts b/tools/binman/test/094_fmap_x86.dts new file mode 100644 index 00000000000..613c5dab425 --- /dev/null +++ b/tools/binman/test/094_fmap_x86.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + end-at-4gb; + size = <0x100>; + pad-byte = <0x61>; + u-boot { + }; + intel-mrc { + }; + fmap { + offset = <0xffffff20>; + }; + }; +}; diff --git a/tools/binman/test/095_fmap_x86_section.dts b/tools/binman/test/095_fmap_x86_section.dts new file mode 100644 index 00000000000..4cfce456705 --- /dev/null +++ b/tools/binman/test/095_fmap_x86_section.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + end-at-4gb; + size = <0x100>; + u-boot { + }; + section { + pad-byte = <0x62>; + intel-mrc { + }; + fmap { + offset = <0x20>; + }; + }; + }; +}; diff --git a/tools/binman/test/096_elf.dts b/tools/binman/test/096_elf.dts new file mode 100644 index 00000000000..df3440c3194 --- /dev/null +++ b/tools/binman/test/096_elf.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot-elf { + }; + u-boot-spl-elf { + }; + }; +}; diff --git a/tools/binman/test/097_elf_strip.dts b/tools/binman/test/097_elf_strip.dts new file mode 100644 index 00000000000..6f3c66fd705 --- /dev/null +++ b/tools/binman/test/097_elf_strip.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot-elf { + strip; + }; + u-boot-spl-elf { + }; + }; +}; diff --git a/tools/binman/test/099_hash_section.dts b/tools/binman/test/099_hash_section.dts new file mode 100644 index 00000000000..dcd8683d642 --- /dev/null +++ b/tools/binman/test/099_hash_section.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + section { + u-boot { + }; + fill { + size = <0x10>; + fill-byte = [61]; + }; + hash { + algo = "sha256"; + }; + }; + }; +}; diff --git a/tools/binman/test/09_pack_extra.dts b/tools/binman/test/09_pack_extra.dts deleted file mode 100644 index 0765707dea2..00000000000 --- a/tools/binman/test/09_pack_extra.dts +++ /dev/null @@ -1,35 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - pad-before = <3>; - pad-after = <5>; - }; - - u-boot-align-size-nop { - type = "u-boot"; - align-size = <4>; - }; - - u-boot-align-size { - type = "u-boot"; - align = <16>; - align-size = <32>; - }; - - u-boot-align-end { - type = "u-boot"; - align-end = <64>; - }; - - u-boot-align-both { - type = "u-boot"; - align= <64>; - align-end = <128>; - }; - }; -}; diff --git a/tools/binman/test/10_pack_align_power2.dts b/tools/binman/test/10_pack_align_power2.dts deleted file mode 100644 index 8f6253a3d0f..00000000000 --- a/tools/binman/test/10_pack_align_power2.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - align = <5>; - }; - }; -}; diff --git a/tools/binman/test/11_pack_align_size_power2.dts b/tools/binman/test/11_pack_align_size_power2.dts deleted file mode 100644 index 04f7672ea47..00000000000 --- a/tools/binman/test/11_pack_align_size_power2.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - align-size = <55>; - }; - }; -}; diff --git a/tools/binman/test/12_pack_inv_align.dts b/tools/binman/test/12_pack_inv_align.dts deleted file mode 100644 index d8dd600edb8..00000000000 --- a/tools/binman/test/12_pack_inv_align.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - offset = <5>; - align = <4>; - }; - }; -}; diff --git a/tools/binman/test/13_pack_inv_size_align.dts b/tools/binman/test/13_pack_inv_size_align.dts deleted file mode 100644 index dfafa134d7b..00000000000 --- a/tools/binman/test/13_pack_inv_size_align.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - size = <5>; - align-size = <4>; - }; - }; -}; diff --git a/tools/binman/test/14_pack_overlap.dts b/tools/binman/test/14_pack_overlap.dts deleted file mode 100644 index 3895cba3bdb..00000000000 --- a/tools/binman/test/14_pack_overlap.dts +++ /dev/null @@ -1,16 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - }; - - u-boot-align { - type = "u-boot"; - offset = <3>; - }; - }; -}; diff --git a/tools/binman/test/15_pack_overflow.dts b/tools/binman/test/15_pack_overflow.dts deleted file mode 100644 index 6f654330afc..00000000000 --- a/tools/binman/test/15_pack_overflow.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - size = <3>; - }; - }; -}; diff --git a/tools/binman/test/16_pack_image_overflow.dts b/tools/binman/test/16_pack_image_overflow.dts deleted file mode 100644 index 6ae66f3ac95..00000000000 --- a/tools/binman/test/16_pack_image_overflow.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <3>; - - u-boot { - }; - }; -}; diff --git a/tools/binman/test/17_pack_image_size.dts b/tools/binman/test/17_pack_image_size.dts deleted file mode 100644 index 2360eb5d19a..00000000000 --- a/tools/binman/test/17_pack_image_size.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <7>; - - u-boot { - }; - }; -}; diff --git a/tools/binman/test/18_pack_image_align.dts b/tools/binman/test/18_pack_image_align.dts deleted file mode 100644 index 16cd2a422ef..00000000000 --- a/tools/binman/test/18_pack_image_align.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - align-size = <16>; - - u-boot { - }; - }; -}; diff --git a/tools/binman/test/19_pack_inv_image_align.dts b/tools/binman/test/19_pack_inv_image_align.dts deleted file mode 100644 index e5ee87b88fb..00000000000 --- a/tools/binman/test/19_pack_inv_image_align.dts +++ /dev/null @@ -1,14 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <7>; - align-size = <8>; - - u-boot { - }; - }; -}; diff --git a/tools/binman/test/20_pack_inv_image_align_power2.dts b/tools/binman/test/20_pack_inv_image_align_power2.dts deleted file mode 100644 index a428c4be520..00000000000 --- a/tools/binman/test/20_pack_inv_image_align_power2.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - align-size = <131>; - - u-boot { - }; - }; -}; diff --git a/tools/binman/test/21_image_pad.dts b/tools/binman/test/21_image_pad.dts deleted file mode 100644 index c6516689d94..00000000000 --- a/tools/binman/test/21_image_pad.dts +++ /dev/null @@ -1,16 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - pad-byte = <0xff>; - u-boot-spl { - }; - - u-boot { - offset = <20>; - }; - }; -}; diff --git a/tools/binman/test/22_image_name.dts b/tools/binman/test/22_image_name.dts deleted file mode 100644 index 94fc069c176..00000000000 --- a/tools/binman/test/22_image_name.dts +++ /dev/null @@ -1,21 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - multiple-images; - image1 { - filename = "test-name"; - u-boot { - }; - }; - - image2 { - filename = "test-name.xx"; - u-boot { - }; - }; - }; -}; diff --git a/tools/binman/test/23_blob.dts b/tools/binman/test/23_blob.dts deleted file mode 100644 index 7dcff69666a..00000000000 --- a/tools/binman/test/23_blob.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - blob { - filename = "blobfile"; - }; - }; -}; diff --git a/tools/binman/test/24_sorted.dts b/tools/binman/test/24_sorted.dts deleted file mode 100644 index d35d39f077d..00000000000 --- a/tools/binman/test/24_sorted.dts +++ /dev/null @@ -1,17 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - u-boot { - offset = <22>; - }; - - u-boot-spl { - offset = <1>; - }; - }; -}; diff --git a/tools/binman/test/25_pack_zero_size.dts b/tools/binman/test/25_pack_zero_size.dts deleted file mode 100644 index e863c44e3fd..00000000000 --- a/tools/binman/test/25_pack_zero_size.dts +++ /dev/null @@ -1,15 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot { - }; - - u-boot-spl { - offset = <0>; - }; - }; -}; diff --git a/tools/binman/test/26_pack_u_boot_dtb.dts b/tools/binman/test/26_pack_u_boot_dtb.dts deleted file mode 100644 index 2707a7347a4..00000000000 --- a/tools/binman/test/26_pack_u_boot_dtb.dts +++ /dev/null @@ -1,14 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot-nodtb { - }; - - u-boot-dtb { - }; - }; -}; diff --git a/tools/binman/test/27_pack_4gb_no_size.dts b/tools/binman/test/27_pack_4gb_no_size.dts deleted file mode 100644 index 371cca10d58..00000000000 --- a/tools/binman/test/27_pack_4gb_no_size.dts +++ /dev/null @@ -1,18 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - u-boot { - offset = <0xfffffff0>; - }; - - u-boot-spl { - offset = <0xfffffff7>; - }; - }; -}; diff --git a/tools/binman/test/28_pack_4gb_outside.dts b/tools/binman/test/28_pack_4gb_outside.dts deleted file mode 100644 index 2216abfb70c..00000000000 --- a/tools/binman/test/28_pack_4gb_outside.dts +++ /dev/null @@ -1,19 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <32>; - u-boot { - offset = <0>; - }; - - u-boot-spl { - offset = <0xffffffeb>; - }; - }; -}; diff --git a/tools/binman/test/29_x86-rom.dts b/tools/binman/test/29_x86-rom.dts deleted file mode 100644 index d5c69f9d4a9..00000000000 --- a/tools/binman/test/29_x86-rom.dts +++ /dev/null @@ -1,19 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <32>; - u-boot { - offset = <0xffffffe0>; - }; - - u-boot-spl { - offset = <0xffffffeb>; - }; - }; -}; diff --git a/tools/binman/test/30_x86-rom-me-no-desc.dts b/tools/binman/test/30_x86-rom-me-no-desc.dts deleted file mode 100644 index 796cb87afc7..00000000000 --- a/tools/binman/test/30_x86-rom-me-no-desc.dts +++ /dev/null @@ -1,16 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <16>; - intel-me { - filename = "me.bin"; - offset-unset; - }; - }; -}; diff --git a/tools/binman/test/31_x86-rom-me.dts b/tools/binman/test/31_x86-rom-me.dts deleted file mode 100644 index b8b0a5a74bb..00000000000 --- a/tools/binman/test/31_x86-rom-me.dts +++ /dev/null @@ -1,20 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x800000>; - intel-descriptor { - filename = "descriptor.bin"; - }; - - intel-me { - filename = "me.bin"; - offset-unset; - }; - }; -}; diff --git a/tools/binman/test/32_intel-vga.dts b/tools/binman/test/32_intel-vga.dts deleted file mode 100644 index 9c532d03d3c..00000000000 --- a/tools/binman/test/32_intel-vga.dts +++ /dev/null @@ -1,14 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - intel-vga { - filename = "vga.bin"; - }; - }; -}; diff --git a/tools/binman/test/33_x86-start16.dts b/tools/binman/test/33_x86-start16.dts deleted file mode 100644 index 2e279dee9d6..00000000000 --- a/tools/binman/test/33_x86-start16.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - x86-start16 { - }; - }; -}; diff --git a/tools/binman/test/34_x86_ucode.dts b/tools/binman/test/34_x86_ucode.dts deleted file mode 100644 index 40725731cd3..00000000000 --- a/tools/binman/test/34_x86_ucode.dts +++ /dev/null @@ -1,29 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-with-ucode-ptr { - }; - - u-boot-dtb-with-ucode { - }; - - u-boot-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/35_x86_single_ucode.dts b/tools/binman/test/35_x86_single_ucode.dts deleted file mode 100644 index 2b1f086a41c..00000000000 --- a/tools/binman/test/35_x86_single_ucode.dts +++ /dev/null @@ -1,26 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-with-ucode-ptr { - }; - - u-boot-dtb-with-ucode { - }; - - u-boot-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - }; -}; diff --git a/tools/binman/test/36_u_boot_img.dts b/tools/binman/test/36_u_boot_img.dts deleted file mode 100644 index aa5a3fe4810..00000000000 --- a/tools/binman/test/36_u_boot_img.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot-img { - }; - }; -}; diff --git a/tools/binman/test/37_x86_no_ucode.dts b/tools/binman/test/37_x86_no_ucode.dts deleted file mode 100644 index 6da49c3da6d..00000000000 --- a/tools/binman/test/37_x86_no_ucode.dts +++ /dev/null @@ -1,20 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-with-ucode-ptr { - }; - - u-boot-dtb-with-ucode { - }; - - u-boot-ucode { - }; - }; -}; diff --git a/tools/binman/test/38_x86_ucode_missing_node.dts b/tools/binman/test/38_x86_ucode_missing_node.dts deleted file mode 100644 index 720677c9c1e..00000000000 --- a/tools/binman/test/38_x86_ucode_missing_node.dts +++ /dev/null @@ -1,26 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-with-ucode-ptr { - }; - - u-boot-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/39_x86_ucode_missing_node2.dts b/tools/binman/test/39_x86_ucode_missing_node2.dts deleted file mode 100644 index 10ac086d549..00000000000 --- a/tools/binman/test/39_x86_ucode_missing_node2.dts +++ /dev/null @@ -1,23 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-with-ucode-ptr { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/40_x86_ucode_not_in_image.dts b/tools/binman/test/40_x86_ucode_not_in_image.dts deleted file mode 100644 index 609725824a5..00000000000 --- a/tools/binman/test/40_x86_ucode_not_in_image.dts +++ /dev/null @@ -1,28 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - size = <0x200>; - u-boot-with-ucode-ptr { - }; - - u-boot-dtb-with-ucode { - }; - - u-boot-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/41_unknown_pos_size.dts b/tools/binman/test/41_unknown_pos_size.dts deleted file mode 100644 index 94fe821c470..00000000000 --- a/tools/binman/test/41_unknown_pos_size.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - _testing { - return-invalid-entry; - }; - }; -}; diff --git a/tools/binman/test/42_intel-fsp.dts b/tools/binman/test/42_intel-fsp.dts deleted file mode 100644 index 8a7c889251b..00000000000 --- a/tools/binman/test/42_intel-fsp.dts +++ /dev/null @@ -1,14 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - intel-fsp { - filename = "fsp.bin"; - }; - }; -}; diff --git a/tools/binman/test/43_intel-cmc.dts b/tools/binman/test/43_intel-cmc.dts deleted file mode 100644 index 5a56c7d881a..00000000000 --- a/tools/binman/test/43_intel-cmc.dts +++ /dev/null @@ -1,14 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - intel-cmc { - filename = "cmc.bin"; - }; - }; -}; diff --git a/tools/binman/test/44_x86_optional_ucode.dts b/tools/binman/test/44_x86_optional_ucode.dts deleted file mode 100644 index 24a7040d318..00000000000 --- a/tools/binman/test/44_x86_optional_ucode.dts +++ /dev/null @@ -1,30 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-with-ucode-ptr { - optional-ucode; - }; - - u-boot-dtb-with-ucode { - }; - - u-boot-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/45_prop_test.dts b/tools/binman/test/45_prop_test.dts deleted file mode 100644 index 064de2b3167..00000000000 --- a/tools/binman/test/45_prop_test.dts +++ /dev/null @@ -1,23 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <16>; - intel-me { - filename = "me.bin"; - offset-unset; - intval = <3>; - intarray = <5 6>; - byteval = [08]; - bytearray = [01 23 34]; - longbytearray = [09 0a 0b 0c]; - stringval = "message2"; - stringarray = "another", "multi-word", "message"; - }; - }; -}; diff --git a/tools/binman/test/46_intel-vbt.dts b/tools/binman/test/46_intel-vbt.dts deleted file mode 100644 index 733f5751d5a..00000000000 --- a/tools/binman/test/46_intel-vbt.dts +++ /dev/null @@ -1,14 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - intel-vbt { - filename = "vbt.bin"; - }; - }; -}; diff --git a/tools/binman/test/47_spl_bss_pad.dts b/tools/binman/test/47_spl_bss_pad.dts deleted file mode 100644 index 6bd88b83f98..00000000000 --- a/tools/binman/test/47_spl_bss_pad.dts +++ /dev/null @@ -1,17 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot-spl { - }; - - u-boot-spl-bss-pad { - }; - - u-boot { - }; - }; -}; diff --git a/tools/binman/test/48_x86-start16-spl.dts b/tools/binman/test/48_x86-start16-spl.dts deleted file mode 100644 index e2009f15f05..00000000000 --- a/tools/binman/test/48_x86-start16-spl.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - x86-start16-spl { - }; - }; -}; diff --git a/tools/binman/test/49_x86_ucode_spl.dts b/tools/binman/test/49_x86_ucode_spl.dts deleted file mode 100644 index 350d2c4730b..00000000000 --- a/tools/binman/test/49_x86_ucode_spl.dts +++ /dev/null @@ -1,29 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-spl-with-ucode-ptr { - }; - - u-boot-dtb-with-ucode { - }; - - u-boot-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/50_intel_mrc.dts b/tools/binman/test/50_intel_mrc.dts deleted file mode 100644 index 54cd52a2b71..00000000000 --- a/tools/binman/test/50_intel_mrc.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - intel-mrc { - }; - }; -}; diff --git a/tools/binman/test/51_u_boot_spl_dtb.dts b/tools/binman/test/51_u_boot_spl_dtb.dts deleted file mode 100644 index 3912f86b4cd..00000000000 --- a/tools/binman/test/51_u_boot_spl_dtb.dts +++ /dev/null @@ -1,13 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - u-boot-spl-dtb { - }; - }; -}; diff --git a/tools/binman/test/52_u_boot_spl_nodtb.dts b/tools/binman/test/52_u_boot_spl_nodtb.dts deleted file mode 100644 index 7f4e27780fe..00000000000 --- a/tools/binman/test/52_u_boot_spl_nodtb.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot-spl-nodtb { - }; - }; -}; diff --git a/tools/binman/test/53_symbols.dts b/tools/binman/test/53_symbols.dts deleted file mode 100644 index 9f135676cb0..00000000000 --- a/tools/binman/test/53_symbols.dts +++ /dev/null @@ -1,20 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - pad-byte = <0xff>; - u-boot-spl { - }; - - u-boot { - offset = <20>; - }; - - u-boot-spl2 { - type = "u-boot-spl"; - }; - }; -}; diff --git a/tools/binman/test/54_unit_address.dts b/tools/binman/test/54_unit_address.dts deleted file mode 100644 index 3216dbbcc19..00000000000 --- a/tools/binman/test/54_unit_address.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot@0 { - }; - u-boot@1 { - }; - }; -}; diff --git a/tools/binman/test/55_sections.dts b/tools/binman/test/55_sections.dts deleted file mode 100644 index 6b306aeda46..00000000000 --- a/tools/binman/test/55_sections.dts +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - pad-byte = <0x26>; - size = <0x28>; - section@0 { - read-only; - size = <0x10>; - pad-byte = <0x21>; - - u-boot { - }; - }; - section@1 { - size = <0x10>; - pad-byte = <0x61>; - - u-boot { - }; - }; - section@2 { - u-boot { - }; - }; - }; -}; diff --git a/tools/binman/test/56_name_prefix.dts b/tools/binman/test/56_name_prefix.dts deleted file mode 100644 index f38c80eb183..00000000000 --- a/tools/binman/test/56_name_prefix.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - pad-byte = <0x26>; - size = <0x28>; - section@0 { - read-only; - name-prefix = "ro-"; - size = <0x10>; - pad-byte = <0x21>; - - u-boot { - }; - }; - section@1 { - name-prefix = "rw-"; - size = <0x10>; - pad-byte = <0x61>; - - u-boot { - }; - }; - }; -}; diff --git a/tools/binman/test/57_unknown_contents.dts b/tools/binman/test/57_unknown_contents.dts deleted file mode 100644 index 6ea98d7cab6..00000000000 --- a/tools/binman/test/57_unknown_contents.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - _testing { - return-unknown-contents; - }; - }; -}; diff --git a/tools/binman/test/58_x86_ucode_spl_needs_retry.dts b/tools/binman/test/58_x86_ucode_spl_needs_retry.dts deleted file mode 100644 index a04adaaf7ba..00000000000 --- a/tools/binman/test/58_x86_ucode_spl_needs_retry.dts +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-spl-with-ucode-ptr { - }; - - /* - * Microcode goes before the DTB which contains it, so binman - * will need to obtain the contents of the next section before - * obtaining the contents of this one. - */ - u-boot-ucode { - }; - - u-boot-dtb-with-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/59_change_size.dts b/tools/binman/test/59_change_size.dts deleted file mode 100644 index 1a69026a64c..00000000000 --- a/tools/binman/test/59_change_size.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - _testing { - bad-update-contents; - }; - }; -}; diff --git a/tools/binman/test/60_fdt_update.dts b/tools/binman/test/60_fdt_update.dts deleted file mode 100644 index f53c8a5053e..00000000000 --- a/tools/binman/test/60_fdt_update.dts +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - pad-byte = <0x26>; - size = <0x28>; - section@0 { - read-only; - name-prefix = "ro-"; - size = <0x10>; - pad-byte = <0x21>; - - u-boot { - }; - }; - section@1 { - name-prefix = "rw-"; - size = <0x10>; - pad-byte = <0x61>; - - u-boot { - }; - }; - _testing { - }; - }; -}; diff --git a/tools/binman/test/61_fdt_update_bad.dts b/tools/binman/test/61_fdt_update_bad.dts deleted file mode 100644 index e5abf31699c..00000000000 --- a/tools/binman/test/61_fdt_update_bad.dts +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - pad-byte = <0x26>; - size = <0x28>; - section@0 { - read-only; - name-prefix = "ro-"; - size = <0x10>; - pad-byte = <0x21>; - - u-boot { - }; - }; - section@1 { - name-prefix = "rw-"; - size = <0x10>; - pad-byte = <0x61>; - - u-boot { - }; - }; - _testing { - never-complete-process-fdt; - }; - }; -}; diff --git a/tools/binman/test/62_entry_args.dts b/tools/binman/test/62_entry_args.dts deleted file mode 100644 index 4d4f102d60c..00000000000 --- a/tools/binman/test/62_entry_args.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - _testing { - test-str-fdt = "test0"; - test-int-fdt = <123>; - }; - }; -}; diff --git a/tools/binman/test/63_entry_args_missing.dts b/tools/binman/test/63_entry_args_missing.dts deleted file mode 100644 index 1644e2fef3a..00000000000 --- a/tools/binman/test/63_entry_args_missing.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - _testing { - test-str-fdt = "test0"; - }; - }; -}; diff --git a/tools/binman/test/64_entry_args_required.dts b/tools/binman/test/64_entry_args_required.dts deleted file mode 100644 index 705be100691..00000000000 --- a/tools/binman/test/64_entry_args_required.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - _testing { - require-args; - test-str-fdt = "test0"; - }; - }; -}; diff --git a/tools/binman/test/65_entry_args_unknown_datatype.dts b/tools/binman/test/65_entry_args_unknown_datatype.dts deleted file mode 100644 index 3e4838f4fff..00000000000 --- a/tools/binman/test/65_entry_args_unknown_datatype.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - _testing { - test-str-fdt = "test0"; - test-int-fdt = <123>; - force-bad-datatype; - }; - }; -}; diff --git a/tools/binman/test/66_text.dts b/tools/binman/test/66_text.dts deleted file mode 100644 index 59b1fed0ef8..00000000000 --- a/tools/binman/test/66_text.dts +++ /dev/null @@ -1,28 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - text { - size = <8>; - text-label = "test-id"; - }; - text2 { - type = "text"; - text-label = "test-id2"; - }; - text3 { - type = "text"; - text-label = "test-id3"; - }; - /* This one does not use command-line args */ - text4 { - type = "text"; - text-label = "test-id4"; - test-id4 = "some text"; - }; - }; -}; diff --git a/tools/binman/test/67_fmap.dts b/tools/binman/test/67_fmap.dts deleted file mode 100644 index 9c0e293ac83..00000000000 --- a/tools/binman/test/67_fmap.dts +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - section@0 { - read-only; - name-prefix = "ro-"; - size = <0x10>; - pad-byte = <0x21>; - - u-boot { - }; - }; - section@1 { - name-prefix = "rw-"; - size = <0x10>; - pad-byte = <0x61>; - - u-boot { - }; - }; - fmap { - }; - }; -}; diff --git a/tools/binman/test/68_blob_named_by_arg.dts b/tools/binman/test/68_blob_named_by_arg.dts deleted file mode 100644 index e129f843cd5..00000000000 --- a/tools/binman/test/68_blob_named_by_arg.dts +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - cros-ec-rw { - }; - }; -}; diff --git a/tools/binman/test/69_fill.dts b/tools/binman/test/69_fill.dts deleted file mode 100644 index e372ea37aaa..00000000000 --- a/tools/binman/test/69_fill.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - fill { - size = <8>; - fill-byte = [ff]; - }; - }; -}; diff --git a/tools/binman/test/70_fill_no_size.dts b/tools/binman/test/70_fill_no_size.dts deleted file mode 100644 index 7b1fcf1b68b..00000000000 --- a/tools/binman/test/70_fill_no_size.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - fill { - fill-byte = [ff]; - }; - }; -}; diff --git a/tools/binman/test/71_gbb.dts b/tools/binman/test/71_gbb.dts deleted file mode 100644 index 551756372af..00000000000 --- a/tools/binman/test/71_gbb.dts +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - gbb { - size = <0x2180>; - flags { - dev-screen-short-delay; - load-option-roms; - enable-alternate-os; - force-dev-switch-on; - force-dev-boot-usb; - disable-fw-rollback-check; - enter-triggers-tonorm; - force-dev-boot-legacy; - faft-key-override; - disable-ec-software-sync; - default-dev-boot-legacy; - disable-pd-software-sync; - disable-lid-shutdown; - force-dev-boot-fastboot-full-cap; - enable-serial; - disable-dwmp; - }; - }; - }; -}; diff --git a/tools/binman/test/72_gbb_too_small.dts b/tools/binman/test/72_gbb_too_small.dts deleted file mode 100644 index c088f36a1d0..00000000000 --- a/tools/binman/test/72_gbb_too_small.dts +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - gbb { - size = <0x200>; - }; - }; -}; diff --git a/tools/binman/test/73_gbb_no_size.dts b/tools/binman/test/73_gbb_no_size.dts deleted file mode 100644 index 83be4037852..00000000000 --- a/tools/binman/test/73_gbb_no_size.dts +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - gbb { - }; - }; -}; diff --git a/tools/binman/test/74_vblock.dts b/tools/binman/test/74_vblock.dts deleted file mode 100644 index f0c21bfe9fc..00000000000 --- a/tools/binman/test/74_vblock.dts +++ /dev/null @@ -1,28 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u_boot: u-boot { - }; - - vblock { - content = <&u_boot &dtb>; - keyblock = "firmware.keyblock"; - signprivate = "firmware_data_key.vbprivk"; - version = <1>; - kernelkey = "kernel_subkey.vbpubk"; - preamble-flags = <1>; - }; - - /* - * Put this after the vblock so that its contents are not - * available when the vblock first tries to obtain its contents - */ - dtb: u-boot-dtb { - }; - }; -}; diff --git a/tools/binman/test/75_vblock_no_content.dts b/tools/binman/test/75_vblock_no_content.dts deleted file mode 100644 index 676d9474b31..00000000000 --- a/tools/binman/test/75_vblock_no_content.dts +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u_boot: u-boot { - }; - - vblock { - keyblock = "firmware.keyblock"; - signprivate = "firmware_data_key.vbprivk"; - version = <1>; - kernelkey = "kernel_subkey.vbpubk"; - preamble-flags = <1>; - }; - - dtb: u-boot-dtb { - }; - }; -}; diff --git a/tools/binman/test/76_vblock_bad_phandle.dts b/tools/binman/test/76_vblock_bad_phandle.dts deleted file mode 100644 index ffbd0c335c3..00000000000 --- a/tools/binman/test/76_vblock_bad_phandle.dts +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u_boot: u-boot { - }; - - vblock { - content = <1000>; - keyblock = "firmware.keyblock"; - signprivate = "firmware_data_key.vbprivk"; - version = <1>; - kernelkey = "kernel_subkey.vbpubk"; - preamble-flags = <1>; - }; - - dtb: u-boot-dtb { - }; - }; -}; diff --git a/tools/binman/test/77_vblock_bad_entry.dts b/tools/binman/test/77_vblock_bad_entry.dts deleted file mode 100644 index 764c42a56e1..00000000000 --- a/tools/binman/test/77_vblock_bad_entry.dts +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u_boot: u-boot { - }; - - vblock { - content = <&u_boot &other>; - keyblock = "firmware.keyblock"; - signprivate = "firmware_data_key.vbprivk"; - version = <1>; - kernelkey = "kernel_subkey.vbpubk"; - preamble-flags = <1>; - }; - - dtb: u-boot-dtb { - }; - }; - - other: other { - }; -}; diff --git a/tools/binman/test/78_u_boot_tpl.dts b/tools/binman/test/78_u_boot_tpl.dts deleted file mode 100644 index 6c60b4c46f4..00000000000 --- a/tools/binman/test/78_u_boot_tpl.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - u-boot-tpl { - }; - u-boot-tpl-dtb { - }; - }; -}; diff --git a/tools/binman/test/79_uses_pos.dts b/tools/binman/test/79_uses_pos.dts deleted file mode 100644 index 7638b9b5e0c..00000000000 --- a/tools/binman/test/79_uses_pos.dts +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - u-boot { - pos = <10>; - }; - }; -}; diff --git a/tools/binman/test/80_fill_empty.dts b/tools/binman/test/80_fill_empty.dts deleted file mode 100644 index 2b78d3ae88d..00000000000 --- a/tools/binman/test/80_fill_empty.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - fill { - size = <0>; - fill-byte = [ff]; - }; - }; -}; diff --git a/tools/binman/test/81_x86-start16-tpl.dts b/tools/binman/test/81_x86-start16-tpl.dts deleted file mode 100644 index 68e6bbd68f0..00000000000 --- a/tools/binman/test/81_x86-start16-tpl.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - x86-start16-tpl { - }; - }; -}; diff --git a/tools/binman/test/82_fdt_update_all.dts b/tools/binman/test/82_fdt_update_all.dts deleted file mode 100644 index 284975cc289..00000000000 --- a/tools/binman/test/82_fdt_update_all.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - section { - u-boot-dtb { - }; - }; - u-boot-spl-dtb { - }; - u-boot-tpl-dtb { - }; - }; -}; diff --git a/tools/binman/test/83_compress.dts b/tools/binman/test/83_compress.dts deleted file mode 100644 index 07813bdeaa3..00000000000 --- a/tools/binman/test/83_compress.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - blob { - filename = "compress"; - compress = "lz4"; - }; - }; -}; diff --git a/tools/binman/test/84_files.dts b/tools/binman/test/84_files.dts deleted file mode 100644 index 83ddb78f8e7..00000000000 --- a/tools/binman/test/84_files.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - files { - pattern = "files/*.dat"; - compress = "none"; - }; - }; -}; diff --git a/tools/binman/test/85_files_compress.dts b/tools/binman/test/85_files_compress.dts deleted file mode 100644 index 847b398bf2b..00000000000 --- a/tools/binman/test/85_files_compress.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - files { - pattern = "files/*.dat"; - compress = "lz4"; - }; - }; -}; diff --git a/tools/binman/test/86_files_none.dts b/tools/binman/test/86_files_none.dts deleted file mode 100644 index 34bd92f224a..00000000000 --- a/tools/binman/test/86_files_none.dts +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - files { - pattern = "files/*.none"; - compress = "none"; - require-matches; - }; - }; -}; diff --git a/tools/binman/test/87_files_no_pattern.dts b/tools/binman/test/87_files_no_pattern.dts deleted file mode 100644 index 0cb5b469cb0..00000000000 --- a/tools/binman/test/87_files_no_pattern.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - files { - compress = "none"; - require-matches; - }; - }; -}; diff --git a/tools/binman/test/88_expand_size.dts b/tools/binman/test/88_expand_size.dts deleted file mode 100644 index c8a01308ec5..00000000000 --- a/tools/binman/test/88_expand_size.dts +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - size = <40>; - fill { - expand-size; - fill-byte = [61]; - size = <0>; - }; - u-boot { - offset = <8>; - }; - section { - expand-size; - pad-byte = <0x62>; - intel-mrc { - }; - }; - u-boot2 { - type = "u-boot"; - offset = <16>; - }; - section2 { - type = "section"; - fill { - expand-size; - fill-byte = [63]; - size = <0>; - }; - u-boot { - offset = <8>; - }; - }; - fill2 { - type = "fill"; - expand-size; - fill-byte = [64]; - size = <0>; - }; - }; -}; diff --git a/tools/binman/test/89_expand_size_bad.dts b/tools/binman/test/89_expand_size_bad.dts deleted file mode 100644 index edc0e5cf681..00000000000 --- a/tools/binman/test/89_expand_size_bad.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - _testing { - expand-size; - return-contents-once; - }; - u-boot { - offset = <8>; - }; - }; -}; diff --git a/tools/binman/test/90_hash.dts b/tools/binman/test/90_hash.dts deleted file mode 100644 index 200304599dc..00000000000 --- a/tools/binman/test/90_hash.dts +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - u-boot { - hash { - algo = "sha256"; - }; - }; - }; -}; diff --git a/tools/binman/test/91_hash_no_algo.dts b/tools/binman/test/91_hash_no_algo.dts deleted file mode 100644 index b64df205117..00000000000 --- a/tools/binman/test/91_hash_no_algo.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - u-boot { - hash { - }; - }; - }; -}; diff --git a/tools/binman/test/92_hash_bad_algo.dts b/tools/binman/test/92_hash_bad_algo.dts deleted file mode 100644 index d2402000db6..00000000000 --- a/tools/binman/test/92_hash_bad_algo.dts +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - u-boot { - hash { - algo = "invalid"; - }; - }; - }; -}; diff --git a/tools/binman/test/93_x86_tpl_ucode.dts b/tools/binman/test/93_x86_tpl_ucode.dts deleted file mode 100644 index d7ed9fc66b8..00000000000 --- a/tools/binman/test/93_x86_tpl_ucode.dts +++ /dev/null @@ -1,29 +0,0 @@ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - sort-by-offset; - end-at-4gb; - size = <0x200>; - u-boot-tpl-with-ucode-ptr { - }; - - u-boot-tpl-dtb-with-ucode { - }; - - u-boot-ucode { - }; - }; - - microcode { - update@0 { - data = <0x12345678 0x12345679>; - }; - update@1 { - data = <0xabcd0000 0x78235609>; - }; - }; -}; diff --git a/tools/binman/test/94_fmap_x86.dts b/tools/binman/test/94_fmap_x86.dts deleted file mode 100644 index 613c5dab425..00000000000 --- a/tools/binman/test/94_fmap_x86.dts +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - end-at-4gb; - size = <0x100>; - pad-byte = <0x61>; - u-boot { - }; - intel-mrc { - }; - fmap { - offset = <0xffffff20>; - }; - }; -}; diff --git a/tools/binman/test/95_fmap_x86_section.dts b/tools/binman/test/95_fmap_x86_section.dts deleted file mode 100644 index 4cfce456705..00000000000 --- a/tools/binman/test/95_fmap_x86_section.dts +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - end-at-4gb; - size = <0x100>; - u-boot { - }; - section { - pad-byte = <0x62>; - intel-mrc { - }; - fmap { - offset = <0x20>; - }; - }; - }; -}; diff --git a/tools/binman/test/96_elf.dts b/tools/binman/test/96_elf.dts deleted file mode 100644 index df3440c3194..00000000000 --- a/tools/binman/test/96_elf.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot-elf { - }; - u-boot-spl-elf { - }; - }; -}; diff --git a/tools/binman/test/97_elf_strip.dts b/tools/binman/test/97_elf_strip.dts deleted file mode 100644 index 6f3c66fd705..00000000000 --- a/tools/binman/test/97_elf_strip.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - u-boot-elf { - strip; - }; - u-boot-spl-elf { - }; - }; -}; diff --git a/tools/binman/test/99_hash_section.dts b/tools/binman/test/99_hash_section.dts deleted file mode 100644 index dcd8683d642..00000000000 --- a/tools/binman/test/99_hash_section.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - section { - u-boot { - }; - fill { - size = <0x10>; - fill-byte = [61]; - }; - hash { - algo = "sha256"; - }; - }; - }; -}; -- cgit v1.3.1 From 41b781ddf1869f5349e05ace888979f3673fe8c6 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Oct 2018 12:22:49 -0600 Subject: dtoc: Fix the value of SetInt() This does not set the correct value at present. Fix it. Signed-off-by: Simon Glass --- tools/dtoc/fdt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index 2df2d4b0cc7..9ad72f89ec7 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -171,7 +171,7 @@ class Prop: val: Integer value (32-bit, single cell) """ self.bytes = struct.pack('>I', val); - self.value = val + self.value = self.bytes self.type = TYPE_INT self.dirty = True -- cgit v1.3.1