2018-05-06 21:58:06 +00:00
|
|
|
# SPDX-License-Identifier: GPL-2.0+
|
2016-11-26 03:15:52 +00:00
|
|
|
# Copyright (c) 2016 Google, Inc
|
|
|
|
# Written by Simon Glass <sjg@chromium.org>
|
|
|
|
#
|
|
|
|
# To run a single test, change to this directory, and:
|
|
|
|
#
|
|
|
|
# python -m unittest func_test.TestFunctional.testHelp
|
|
|
|
|
|
|
|
from optparse import OptionParser
|
|
|
|
import os
|
|
|
|
import shutil
|
|
|
|
import struct
|
|
|
|
import sys
|
|
|
|
import tempfile
|
|
|
|
import unittest
|
|
|
|
|
|
|
|
import binman
|
|
|
|
import cmdline
|
|
|
|
import command
|
|
|
|
import control
|
binman: Support accessing binman tables at run time
Binman construct images consisting of multiple binary files. These files
sometimes need to know (at run timme) where their peers are located. For
example, SPL may want to know where U-Boot is located in the image, so
that it can jump to U-Boot correctly on boot.
In general the positions where the binaries end up after binman has
finished packing them cannot be known at compile time. One reason for
this is that binman does not know the size of the binaries until
everything is compiled, linked and converted to binaries with objcopy.
To make this work, we add a feature to binman which checks each binary
for symbol names starting with '_binman'. These are then decoded to figure
out which entry and property they refer to. Then binman writes the value
of this symbol into the appropriate binary. With this, the symbol will
have the correct value at run time.
Macros are used to make this easier to use. As an example, this declares
a symbol that will access the 'u-boot-spl' entry to find the 'pos' value
(i.e. the position of SPL in the image):
binman_sym_declare(unsigned long, u_boot_spl, pos);
This converts to a symbol called '_binman_u_boot_spl_prop_pos' in any
binary that includes it. Binman then updates the value in that binary,
ensuring that it can be accessed at runtime with:
ulong u_boot_pos = binman_sym(ulong, u_boot_spl, pos);
This assigns the variable u_boot_pos to the position of SPL in the image.
Signed-off-by: Simon Glass <sjg@chromium.org>
2017-11-14 01:55:01 +00:00
|
|
|
import elf
|
2017-05-27 13:38:30 +00:00
|
|
|
import fdt
|
2016-11-26 03:15:52 +00:00
|
|
|
import fdt_util
|
2018-07-17 19:25:38 +00:00
|
|
|
import fmap_util
|
2018-07-17 19:25:36 +00:00
|
|
|
import test_util
|
2016-11-26 03:15:52 +00:00
|
|
|
import tools
|
|
|
|
import tout
|
|
|
|
|
|
|
|
# Contents of test files, corresponding to different entry types
|
2017-11-13 04:52:27 +00:00
|
|
|
U_BOOT_DATA = '1234'
|
|
|
|
U_BOOT_IMG_DATA = 'img'
|
2017-11-14 01:54:59 +00:00
|
|
|
U_BOOT_SPL_DATA = '56780123456789abcde'
|
2018-07-17 19:25:48 +00:00
|
|
|
U_BOOT_TPL_DATA = 'tpl'
|
2017-11-13 04:52:27 +00:00
|
|
|
BLOB_DATA = '89'
|
|
|
|
ME_DATA = '0abcd'
|
|
|
|
VGA_DATA = 'vga'
|
|
|
|
U_BOOT_DTB_DATA = 'udtb'
|
2017-11-14 01:54:55 +00:00
|
|
|
U_BOOT_SPL_DTB_DATA = 'spldtb'
|
2018-07-17 19:25:48 +00:00
|
|
|
U_BOOT_TPL_DTB_DATA = 'tpldtb'
|
2017-11-13 04:52:27 +00:00
|
|
|
X86_START16_DATA = 'start16'
|
|
|
|
X86_START16_SPL_DATA = 'start16spl'
|
|
|
|
U_BOOT_NODTB_DATA = 'nodtb with microcode pointer somewhere in here'
|
|
|
|
U_BOOT_SPL_NODTB_DATA = 'splnodtb with microcode pointer somewhere in here'
|
|
|
|
FSP_DATA = 'fsp'
|
|
|
|
CMC_DATA = 'cmc'
|
|
|
|
VBT_DATA = 'vbt'
|
2017-11-13 04:52:28 +00:00
|
|
|
MRC_DATA = 'mrc'
|
2018-07-17 19:25:33 +00:00
|
|
|
TEXT_DATA = 'text'
|
|
|
|
TEXT_DATA2 = 'text2'
|
|
|
|
TEXT_DATA3 = 'text3'
|
2018-07-17 19:25:39 +00:00
|
|
|
CROS_EC_RW_DATA = 'ecrw'
|
2018-07-17 19:25:44 +00:00
|
|
|
GBB_DATA = 'gbbd'
|
|
|
|
BMPBLK_DATA = 'bmp'
|
2018-07-17 19:25:47 +00:00
|
|
|
VBLOCK_DATA = 'vblk'
|
2018-07-17 19:25:39 +00:00
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
|
|
|
|
class TestFunctional(unittest.TestCase):
|
|
|
|
"""Functional tests for binman
|
|
|
|
|
|
|
|
Most of these use a sample .dts file to build an image and then check
|
|
|
|
that it looks correct. The sample files are in the test/ subdirectory
|
|
|
|
and are numbered.
|
|
|
|
|
|
|
|
For each entry type a very small test file is created using fixed
|
|
|
|
string contents. This makes it easy to test that things look right, and
|
|
|
|
debug problems.
|
|
|
|
|
|
|
|
In some cases a 'real' file must be used - these are also supplied in
|
|
|
|
the test/ diurectory.
|
|
|
|
"""
|
|
|
|
@classmethod
|
|
|
|
def setUpClass(self):
|
2017-11-13 04:52:20 +00:00
|
|
|
global entry
|
|
|
|
import entry
|
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
# Handle the case where argv[0] is 'python'
|
|
|
|
self._binman_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
|
|
|
|
self._binman_pathname = os.path.join(self._binman_dir, 'binman')
|
|
|
|
|
|
|
|
# Create a temporary directory for input files
|
|
|
|
self._indir = tempfile.mkdtemp(prefix='binmant.')
|
|
|
|
|
|
|
|
# Create some test files
|
|
|
|
TestFunctional._MakeInputFile('u-boot.bin', U_BOOT_DATA)
|
|
|
|
TestFunctional._MakeInputFile('u-boot.img', U_BOOT_IMG_DATA)
|
|
|
|
TestFunctional._MakeInputFile('spl/u-boot-spl.bin', U_BOOT_SPL_DATA)
|
2018-07-17 19:25:48 +00:00
|
|
|
TestFunctional._MakeInputFile('tpl/u-boot-tpl.bin', U_BOOT_TPL_DATA)
|
2016-11-26 03:15:52 +00:00
|
|
|
TestFunctional._MakeInputFile('blobfile', BLOB_DATA)
|
2016-11-26 03:15:53 +00:00
|
|
|
TestFunctional._MakeInputFile('me.bin', ME_DATA)
|
|
|
|
TestFunctional._MakeInputFile('vga.bin', VGA_DATA)
|
2018-07-17 19:25:48 +00:00
|
|
|
self._ResetDtbs()
|
2016-11-26 03:15:53 +00:00
|
|
|
TestFunctional._MakeInputFile('u-boot-x86-16bit.bin', X86_START16_DATA)
|
2017-11-13 04:52:26 +00:00
|
|
|
TestFunctional._MakeInputFile('spl/u-boot-x86-16bit-spl.bin',
|
|
|
|
X86_START16_SPL_DATA)
|
2016-11-26 03:15:52 +00:00
|
|
|
TestFunctional._MakeInputFile('u-boot-nodtb.bin', U_BOOT_NODTB_DATA)
|
2017-11-13 04:52:27 +00:00
|
|
|
TestFunctional._MakeInputFile('spl/u-boot-spl-nodtb.bin',
|
|
|
|
U_BOOT_SPL_NODTB_DATA)
|
2016-11-26 03:15:56 +00:00
|
|
|
TestFunctional._MakeInputFile('fsp.bin', FSP_DATA)
|
|
|
|
TestFunctional._MakeInputFile('cmc.bin', CMC_DATA)
|
2017-08-16 05:41:54 +00:00
|
|
|
TestFunctional._MakeInputFile('vbt.bin', VBT_DATA)
|
2017-11-13 04:52:28 +00:00
|
|
|
TestFunctional._MakeInputFile('mrc.bin', MRC_DATA)
|
2018-07-17 19:25:39 +00:00
|
|
|
TestFunctional._MakeInputFile('ecrw.bin', CROS_EC_RW_DATA)
|
2018-07-17 19:25:44 +00:00
|
|
|
TestFunctional._MakeInputDir('devkeys')
|
|
|
|
TestFunctional._MakeInputFile('bmpblk.bin', BMPBLK_DATA)
|
2016-11-26 03:15:52 +00:00
|
|
|
self._output_setup = False
|
|
|
|
|
2016-11-26 03:15:53 +00:00
|
|
|
# ELF file with a '_dt_ucode_base_size' symbol
|
|
|
|
with open(self.TestFile('u_boot_ucode_ptr')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('u-boot', fd.read())
|
|
|
|
|
|
|
|
# Intel flash descriptor file
|
|
|
|
with open(self.TestFile('descriptor.bin')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('descriptor.bin', fd.read())
|
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
@classmethod
|
|
|
|
def tearDownClass(self):
|
|
|
|
"""Remove the temporary input directory and its contents"""
|
|
|
|
if self._indir:
|
|
|
|
shutil.rmtree(self._indir)
|
|
|
|
self._indir = None
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
# Enable this to turn on debugging output
|
|
|
|
# tout.Init(tout.DEBUG)
|
|
|
|
command.test_result = None
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
"""Remove the temporary output directory"""
|
|
|
|
tools._FinaliseForTest()
|
|
|
|
|
2018-07-17 19:25:48 +00:00
|
|
|
@classmethod
|
|
|
|
def _ResetDtbs(self):
|
|
|
|
TestFunctional._MakeInputFile('u-boot.dtb', U_BOOT_DTB_DATA)
|
|
|
|
TestFunctional._MakeInputFile('spl/u-boot-spl.dtb', U_BOOT_SPL_DTB_DATA)
|
|
|
|
TestFunctional._MakeInputFile('tpl/u-boot-tpl.dtb', U_BOOT_TPL_DTB_DATA)
|
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
def _RunBinman(self, *args, **kwargs):
|
|
|
|
"""Run binman using the command line
|
|
|
|
|
|
|
|
Args:
|
|
|
|
Arguments to pass, as a list of strings
|
|
|
|
kwargs: Arguments to pass to Command.RunPipe()
|
|
|
|
"""
|
|
|
|
result = command.RunPipe([[self._binman_pathname] + list(args)],
|
|
|
|
capture=True, capture_stderr=True, raise_on_error=False)
|
|
|
|
if result.return_code and kwargs.get('raise_on_error', True):
|
|
|
|
raise Exception("Error running '%s': %s" % (' '.join(args),
|
|
|
|
result.stdout + result.stderr))
|
|
|
|
return result
|
|
|
|
|
|
|
|
def _DoBinman(self, *args):
|
|
|
|
"""Run binman using directly (in the same process)
|
|
|
|
|
|
|
|
Args:
|
|
|
|
Arguments to pass, as a list of strings
|
|
|
|
Returns:
|
|
|
|
Return value (0 for success)
|
|
|
|
"""
|
2017-11-14 01:55:00 +00:00
|
|
|
args = list(args)
|
|
|
|
if '-D' in sys.argv:
|
|
|
|
args = args + ['-D']
|
|
|
|
(options, args) = cmdline.ParseArgs(args)
|
2016-11-26 03:15:52 +00:00
|
|
|
options.pager = 'binman-invalid-pager'
|
|
|
|
options.build_dir = self._indir
|
|
|
|
|
|
|
|
# For testing, you can force an increase in verbosity here
|
|
|
|
# options.verbosity = tout.DEBUG
|
|
|
|
return control.Binman(options, args)
|
|
|
|
|
2018-07-17 19:25:32 +00:00
|
|
|
def _DoTestFile(self, fname, debug=False, map=False, update_dtb=False,
|
|
|
|
entry_args=None):
|
2016-11-26 03:15:52 +00:00
|
|
|
"""Run binman with a given test file
|
|
|
|
|
|
|
|
Args:
|
2018-06-01 15:38:19 +00:00
|
|
|
fname: Device-tree source filename to use (e.g. 05_simple.dts)
|
|
|
|
debug: True to enable debugging output
|
2018-06-01 15:38:20 +00:00
|
|
|
map: True to output map files for the images
|
2018-08-01 21:22:37 +00:00
|
|
|
update_dtb: Update the offset and size of each entry in the device
|
2018-07-06 16:27:42 +00:00
|
|
|
tree before packing it into the image
|
2016-11-26 03:15:52 +00:00
|
|
|
"""
|
2017-11-14 01:55:00 +00:00
|
|
|
args = ['-p', '-I', self._indir, '-d', self.TestFile(fname)]
|
|
|
|
if debug:
|
|
|
|
args.append('-D')
|
2018-06-01 15:38:20 +00:00
|
|
|
if map:
|
|
|
|
args.append('-m')
|
2018-07-06 16:27:42 +00:00
|
|
|
if update_dtb:
|
|
|
|
args.append('-up')
|
2018-07-17 19:25:32 +00:00
|
|
|
if entry_args:
|
|
|
|
for arg, value in entry_args.iteritems():
|
|
|
|
args.append('-a%s=%s' % (arg, value))
|
2017-11-14 01:55:00 +00:00
|
|
|
return self._DoBinman(*args)
|
2016-11-26 03:15:52 +00:00
|
|
|
|
|
|
|
def _SetupDtb(self, fname, outfile='u-boot.dtb'):
|
2016-11-26 03:15:53 +00:00
|
|
|
"""Set up a new test device-tree file
|
|
|
|
|
|
|
|
The given file is compiled and set up as the device tree to be used
|
|
|
|
for ths test.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
fname: Filename of .dts file to read
|
2018-06-01 15:38:19 +00:00
|
|
|
outfile: Output filename for compiled device-tree binary
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
Returns:
|
2018-06-01 15:38:19 +00:00
|
|
|
Contents of device-tree binary
|
2016-11-26 03:15:53 +00:00
|
|
|
"""
|
2016-11-26 03:15:52 +00:00
|
|
|
if not self._output_setup:
|
|
|
|
tools.PrepareOutputDir(self._indir, True)
|
|
|
|
self._output_setup = True
|
|
|
|
dtb = fdt_util.EnsureCompiled(self.TestFile(fname))
|
|
|
|
with open(dtb) as fd:
|
|
|
|
data = fd.read()
|
|
|
|
TestFunctional._MakeInputFile(outfile, data)
|
2016-11-26 03:15:53 +00:00
|
|
|
return data
|
2016-11-26 03:15:52 +00:00
|
|
|
|
2018-07-06 16:27:42 +00:00
|
|
|
def _DoReadFileDtb(self, fname, use_real_dtb=False, map=False,
|
2018-07-17 19:25:32 +00:00
|
|
|
update_dtb=False, entry_args=None):
|
2016-11-26 03:15:52 +00:00
|
|
|
"""Run binman and return the resulting image
|
|
|
|
|
|
|
|
This runs binman with a given test file and then reads the resulting
|
|
|
|
output file. It is a shortcut function since most tests need to do
|
|
|
|
these steps.
|
|
|
|
|
|
|
|
Raises an assertion failure if binman returns a non-zero exit code.
|
|
|
|
|
|
|
|
Args:
|
2018-06-01 15:38:19 +00:00
|
|
|
fname: Device-tree source filename to use (e.g. 05_simple.dts)
|
2016-11-26 03:15:52 +00:00
|
|
|
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.
|
|
|
|
But in some test we need the real contents.
|
2018-06-01 15:38:20 +00:00
|
|
|
map: True to output map files for the images
|
2018-08-01 21:22:37 +00:00
|
|
|
update_dtb: Update the offset and size of each entry in the device
|
2018-07-06 16:27:42 +00:00
|
|
|
tree before packing it into the image
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
Tuple:
|
|
|
|
Resulting image contents
|
|
|
|
Device tree contents
|
2018-06-01 15:38:20 +00:00
|
|
|
Map data showing contents of image (or None if none)
|
2018-07-17 19:25:27 +00:00
|
|
|
Output device tree binary filename ('u-boot.dtb' path)
|
2016-11-26 03:15:52 +00:00
|
|
|
"""
|
2016-11-26 03:15:53 +00:00
|
|
|
dtb_data = None
|
2016-11-26 03:15:52 +00:00
|
|
|
# Use the compiled test file as the u-boot-dtb input
|
|
|
|
if use_real_dtb:
|
2016-11-26 03:15:53 +00:00
|
|
|
dtb_data = self._SetupDtb(fname)
|
2016-11-26 03:15:52 +00:00
|
|
|
|
|
|
|
try:
|
2018-07-17 19:25:32 +00:00
|
|
|
retcode = self._DoTestFile(fname, map=map, update_dtb=update_dtb,
|
|
|
|
entry_args=entry_args)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(0, retcode)
|
2018-07-06 16:27:42 +00:00
|
|
|
out_dtb_fname = control.GetFdtPath('u-boot.dtb')
|
2016-11-26 03:15:52 +00:00
|
|
|
|
|
|
|
# Find the (only) image, read it and return its contents
|
|
|
|
image = control.images['image']
|
2018-07-06 16:27:42 +00:00
|
|
|
image_fname = tools.GetOutputFilename('image.bin')
|
|
|
|
self.assertTrue(os.path.exists(image_fname))
|
2018-06-01 15:38:20 +00:00
|
|
|
if map:
|
|
|
|
map_fname = tools.GetOutputFilename('image.map')
|
|
|
|
with open(map_fname) as fd:
|
|
|
|
map_data = fd.read()
|
|
|
|
else:
|
|
|
|
map_data = None
|
2018-07-06 16:27:42 +00:00
|
|
|
with open(image_fname) as fd:
|
|
|
|
return fd.read(), dtb_data, map_data, out_dtb_fname
|
2016-11-26 03:15:52 +00:00
|
|
|
finally:
|
|
|
|
# Put the test file back
|
|
|
|
if use_real_dtb:
|
2018-07-17 19:25:48 +00:00
|
|
|
self._ResetDtbs()
|
2016-11-26 03:15:52 +00:00
|
|
|
|
2016-11-26 03:15:53 +00:00
|
|
|
def _DoReadFile(self, fname, use_real_dtb=False):
|
2018-06-01 15:38:19 +00:00
|
|
|
"""Helper function which discards the device-tree binary
|
|
|
|
|
|
|
|
Args:
|
|
|
|
fname: Device-tree source filename to use (e.g. 05_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.
|
|
|
|
But in some test we need the real contents.
|
2018-07-17 19:25:27 +00:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
Resulting image contents
|
2018-06-01 15:38:19 +00:00
|
|
|
"""
|
2016-11-26 03:15:53 +00:00
|
|
|
return self._DoReadFileDtb(fname, use_real_dtb)[0]
|
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
@classmethod
|
|
|
|
def _MakeInputFile(self, fname, contents):
|
|
|
|
"""Create a new test input file, creating directories as needed
|
|
|
|
|
|
|
|
Args:
|
2018-08-01 21:22:37 +00:00
|
|
|
fname: Filename to create
|
2016-11-26 03:15:52 +00:00
|
|
|
contents: File contents to write in to the file
|
|
|
|
Returns:
|
|
|
|
Full pathname of file created
|
|
|
|
"""
|
|
|
|
pathname = os.path.join(self._indir, fname)
|
|
|
|
dirname = os.path.dirname(pathname)
|
|
|
|
if dirname and not os.path.exists(dirname):
|
|
|
|
os.makedirs(dirname)
|
|
|
|
with open(pathname, 'wb') as fd:
|
|
|
|
fd.write(contents)
|
|
|
|
return pathname
|
|
|
|
|
2018-07-17 19:25:44 +00:00
|
|
|
@classmethod
|
|
|
|
def _MakeInputDir(self, dirname):
|
|
|
|
"""Create a new test input directory, creating directories as needed
|
|
|
|
|
|
|
|
Args:
|
|
|
|
dirname: Directory name to create
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Full pathname of directory created
|
|
|
|
"""
|
|
|
|
pathname = os.path.join(self._indir, dirname)
|
|
|
|
if not os.path.exists(pathname):
|
|
|
|
os.makedirs(pathname)
|
|
|
|
return pathname
|
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
@classmethod
|
|
|
|
def TestFile(self, fname):
|
|
|
|
return os.path.join(self._binman_dir, 'test', fname)
|
|
|
|
|
|
|
|
def AssertInList(self, grep_list, target):
|
|
|
|
"""Assert that at least one of a list of things is in a target
|
|
|
|
|
|
|
|
Args:
|
|
|
|
grep_list: List of strings to check
|
|
|
|
target: Target string
|
|
|
|
"""
|
|
|
|
for grep in grep_list:
|
|
|
|
if grep in target:
|
|
|
|
return
|
|
|
|
self.fail("Error: '%' not found in '%s'" % (grep_list, target))
|
|
|
|
|
|
|
|
def CheckNoGaps(self, entries):
|
|
|
|
"""Check that all entries fit together without gaps
|
|
|
|
|
|
|
|
Args:
|
|
|
|
entries: List of entries to check
|
|
|
|
"""
|
2018-08-01 21:22:37 +00:00
|
|
|
offset = 0
|
2016-11-26 03:15:52 +00:00
|
|
|
for entry in entries.values():
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(offset, entry.offset)
|
|
|
|
offset += entry.size
|
2016-11-26 03:15:52 +00:00
|
|
|
|
2016-11-26 03:15:53 +00:00
|
|
|
def GetFdtLen(self, dtb):
|
2018-06-01 15:38:19 +00:00
|
|
|
"""Get the totalsize field from a device-tree binary
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
Args:
|
2018-06-01 15:38:19 +00:00
|
|
|
dtb: Device-tree binary contents
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
Returns:
|
2018-06-01 15:38:19 +00:00
|
|
|
Total size of device-tree binary, from the header
|
2016-11-26 03:15:53 +00:00
|
|
|
"""
|
|
|
|
return struct.unpack('>L', dtb[4:8])[0]
|
|
|
|
|
2018-07-17 19:25:52 +00:00
|
|
|
def _GetPropTree(self, dtb, prop_names):
|
2018-07-06 16:27:42 +00:00
|
|
|
def AddNode(node, path):
|
|
|
|
if node.name != '/':
|
|
|
|
path += '/' + node.name
|
|
|
|
for subnode in node.subnodes:
|
|
|
|
for prop in subnode.props.values():
|
2018-07-17 19:25:52 +00:00
|
|
|
if prop.name in prop_names:
|
2018-07-06 16:27:42 +00:00
|
|
|
prop_path = path + '/' + subnode.name + ':' + prop.name
|
|
|
|
tree[prop_path[len('/binman/'):]] = fdt_util.fdt32_to_cpu(
|
|
|
|
prop.value)
|
|
|
|
AddNode(subnode, path)
|
|
|
|
|
|
|
|
tree = {}
|
|
|
|
AddNode(dtb.GetRoot(), '')
|
|
|
|
return tree
|
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
def testRun(self):
|
|
|
|
"""Test a basic run with valid args"""
|
|
|
|
result = self._RunBinman('-h')
|
|
|
|
|
|
|
|
def testFullHelp(self):
|
|
|
|
"""Test that the full help is displayed with -H"""
|
|
|
|
result = self._RunBinman('-H')
|
|
|
|
help_file = os.path.join(self._binman_dir, 'README')
|
2018-01-16 20:29:50 +00:00
|
|
|
# Remove possible extraneous strings
|
|
|
|
extra = '::::::::::::::\n' + help_file + '\n::::::::::::::\n'
|
|
|
|
gothelp = result.stdout.replace(extra, '')
|
|
|
|
self.assertEqual(len(gothelp), os.path.getsize(help_file))
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(0, len(result.stderr))
|
|
|
|
self.assertEqual(0, result.return_code)
|
|
|
|
|
|
|
|
def testFullHelpInternal(self):
|
|
|
|
"""Test that the full help is displayed with -H"""
|
|
|
|
try:
|
|
|
|
command.test_result = command.CommandResult()
|
|
|
|
result = self._DoBinman('-H')
|
|
|
|
help_file = os.path.join(self._binman_dir, 'README')
|
|
|
|
finally:
|
|
|
|
command.test_result = None
|
|
|
|
|
|
|
|
def testHelp(self):
|
|
|
|
"""Test that the basic help is displayed with -h"""
|
|
|
|
result = self._RunBinman('-h')
|
|
|
|
self.assertTrue(len(result.stdout) > 200)
|
|
|
|
self.assertEqual(0, len(result.stderr))
|
|
|
|
self.assertEqual(0, result.return_code)
|
|
|
|
|
|
|
|
def testBoard(self):
|
|
|
|
"""Test that we can run it with a specific board"""
|
|
|
|
self._SetupDtb('05_simple.dts', 'sandbox/u-boot.dtb')
|
|
|
|
TestFunctional._MakeInputFile('sandbox/u-boot.bin', U_BOOT_DATA)
|
|
|
|
result = self._DoBinman('-b', 'sandbox')
|
|
|
|
self.assertEqual(0, result)
|
|
|
|
|
|
|
|
def testNeedBoard(self):
|
|
|
|
"""Test that we get an error when no board ius supplied"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
result = self._DoBinman()
|
|
|
|
self.assertIn("Must provide a board to process (use -b <board>)",
|
|
|
|
str(e.exception))
|
|
|
|
|
|
|
|
def testMissingDt(self):
|
2018-06-01 15:38:19 +00:00
|
|
|
"""Test that an invalid device-tree file generates an error"""
|
2016-11-26 03:15:52 +00:00
|
|
|
with self.assertRaises(Exception) as e:
|
|
|
|
self._RunBinman('-d', 'missing_file')
|
|
|
|
# We get one error from libfdt, and a different one from fdtget.
|
|
|
|
self.AssertInList(["Couldn't open blob from 'missing_file'",
|
|
|
|
'No such file or directory'], str(e.exception))
|
|
|
|
|
|
|
|
def testBrokenDt(self):
|
2018-06-01 15:38:19 +00:00
|
|
|
"""Test that an invalid device-tree source file generates an error
|
2016-11-26 03:15:52 +00:00
|
|
|
|
|
|
|
Since this is a source file it should be compiled and the error
|
|
|
|
will come from the device-tree compiler (dtc).
|
|
|
|
"""
|
|
|
|
with self.assertRaises(Exception) as e:
|
|
|
|
self._RunBinman('-d', self.TestFile('01_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.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'))
|
|
|
|
self.assertEqual(0, len(result.stderr))
|
|
|
|
self.assertEqual(0, result.return_code)
|
|
|
|
|
|
|
|
def testInvalidEntry(self):
|
|
|
|
"""Test that an invalid entry is flagged"""
|
|
|
|
with self.assertRaises(Exception) as e:
|
|
|
|
result = self._RunBinman('-d',
|
|
|
|
self.TestFile('04_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')
|
|
|
|
self.assertEqual(U_BOOT_DATA, data)
|
|
|
|
|
2017-11-14 01:55:00 +00:00
|
|
|
def testSimpleDebug(self):
|
|
|
|
"""Test a simple binman run with debugging enabled"""
|
|
|
|
data = self._DoTestFile('05_simple.dts', debug=True)
|
|
|
|
|
2016-11-26 03:15:52 +00:00
|
|
|
def testDual(self):
|
|
|
|
"""Test that we can handle creating two images
|
|
|
|
|
|
|
|
This also tests image padding.
|
|
|
|
"""
|
|
|
|
retcode = self._DoTestFile('06_dual_image.dts')
|
|
|
|
self.assertEqual(0, retcode)
|
|
|
|
|
|
|
|
image = control.images['image1']
|
|
|
|
self.assertEqual(len(U_BOOT_DATA), image._size)
|
|
|
|
fname = tools.GetOutputFilename('image1.bin')
|
|
|
|
self.assertTrue(os.path.exists(fname))
|
|
|
|
with open(fname) as fd:
|
|
|
|
data = fd.read()
|
|
|
|
self.assertEqual(U_BOOT_DATA, data)
|
|
|
|
|
|
|
|
image = control.images['image2']
|
|
|
|
self.assertEqual(3 + len(U_BOOT_DATA) + 5, image._size)
|
|
|
|
fname = tools.GetOutputFilename('image2.bin')
|
|
|
|
self.assertTrue(os.path.exists(fname))
|
|
|
|
with open(fname) as fd:
|
|
|
|
data = fd.read()
|
|
|
|
self.assertEqual(U_BOOT_DATA, data[3:7])
|
|
|
|
self.assertEqual(chr(0) * 3, data[:3])
|
|
|
|
self.assertEqual(chr(0) * 5, data[7:])
|
|
|
|
|
|
|
|
def testBadAlign(self):
|
|
|
|
"""Test that an invalid alignment value is detected"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoTestFile('07_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')
|
|
|
|
self.assertEqual(0, retcode)
|
|
|
|
self.assertIn('image', control.images)
|
|
|
|
image = control.images['image']
|
2018-06-01 15:38:12 +00:00
|
|
|
entries = image.GetEntries()
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(5, len(entries))
|
|
|
|
|
|
|
|
# First u-boot
|
|
|
|
self.assertIn('u-boot', entries)
|
|
|
|
entry = entries['u-boot']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(0, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(len(U_BOOT_DATA), entry.size)
|
|
|
|
|
|
|
|
# Second u-boot, aligned to 16-byte boundary
|
|
|
|
self.assertIn('u-boot-align', entries)
|
|
|
|
entry = entries['u-boot-align']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(16, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(len(U_BOOT_DATA), entry.size)
|
|
|
|
|
|
|
|
# Third u-boot, size 23 bytes
|
|
|
|
self.assertIn('u-boot-size', entries)
|
|
|
|
entry = entries['u-boot-size']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(20, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(len(U_BOOT_DATA), entry.contents_size)
|
|
|
|
self.assertEqual(23, entry.size)
|
|
|
|
|
|
|
|
# Fourth u-boot, placed immediate after the above
|
|
|
|
self.assertIn('u-boot-next', entries)
|
|
|
|
entry = entries['u-boot-next']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(43, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(len(U_BOOT_DATA), entry.size)
|
|
|
|
|
2018-08-01 21:22:37 +00:00
|
|
|
# Fifth u-boot, placed at a fixed offset
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertIn('u-boot-fixed', entries)
|
|
|
|
entry = entries['u-boot-fixed']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(61, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(len(U_BOOT_DATA), entry.size)
|
|
|
|
|
|
|
|
self.assertEqual(65, image._size)
|
|
|
|
|
|
|
|
def testPackExtra(self):
|
|
|
|
"""Test that extra packing feature works as expected"""
|
|
|
|
retcode = self._DoTestFile('09_pack_extra.dts')
|
|
|
|
|
|
|
|
self.assertEqual(0, retcode)
|
|
|
|
self.assertIn('image', control.images)
|
|
|
|
image = control.images['image']
|
2018-06-01 15:38:12 +00:00
|
|
|
entries = image.GetEntries()
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(5, len(entries))
|
|
|
|
|
|
|
|
# First u-boot with padding before and after
|
|
|
|
self.assertIn('u-boot', entries)
|
|
|
|
entry = entries['u-boot']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(0, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(3, entry.pad_before)
|
|
|
|
self.assertEqual(3 + 5 + len(U_BOOT_DATA), entry.size)
|
|
|
|
|
|
|
|
# Second u-boot has an aligned size, but it has no effect
|
|
|
|
self.assertIn('u-boot-align-size-nop', entries)
|
|
|
|
entry = entries['u-boot-align-size-nop']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(12, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(4, entry.size)
|
|
|
|
|
|
|
|
# Third u-boot has an aligned size too
|
|
|
|
self.assertIn('u-boot-align-size', entries)
|
|
|
|
entry = entries['u-boot-align-size']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(16, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(32, entry.size)
|
|
|
|
|
|
|
|
# Fourth u-boot has an aligned end
|
|
|
|
self.assertIn('u-boot-align-end', entries)
|
|
|
|
entry = entries['u-boot-align-end']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(48, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(16, entry.size)
|
|
|
|
|
|
|
|
# Fifth u-boot immediately afterwards
|
|
|
|
self.assertIn('u-boot-align-both', entries)
|
|
|
|
entry = entries['u-boot-align-both']
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(64, entry.offset)
|
2016-11-26 03:15:52 +00:00
|
|
|
self.assertEqual(64, entry.size)
|
|
|
|
|
|
|
|
self.CheckNoGaps(entries)
|
|
|
|
self.assertEqual(128, image._size)
|
|
|
|
|
|
|
|
def testPackAlignPowerOf2(self):
|
|
|
|
"""Test that invalid entry alignment is detected"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoTestFile('10_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.assertIn("Node '/binman/u-boot': Alignment size 55 must be a "
|
|
|
|
"power of two", str(e.exception))
|
|
|
|
|
|
|
|
def testPackInvalidAlign(self):
|
2018-08-01 21:22:37 +00:00
|
|
|
"""Test detection of an offset that does not match its alignment"""
|
2016-11-26 03:15:52 +00:00
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoTestFile('12_pack_inv_align.dts')
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertIn("Node '/binman/u-boot': Offset 0x5 (5) does not match "
|
2016-11-26 03:15:52 +00:00
|
|
|
"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.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')
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertIn("Node '/binman/u-boot-align': Offset 0x3 (3) overlaps "
|
2016-11-26 03:15:52 +00:00
|
|
|
"with previous entry '/binman/u-boot' ending at 0x4 (4)",
|
|
|
|
str(e.exception))
|
|
|
|
|
|
|
|
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.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')
|
2018-06-01 15:38:12 +00:00
|
|
|
self.assertIn("Section '/binman': contents size 0x4 (4) exceeds section "
|
2016-11-26 03:15:52 +00:00
|
|
|
"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')
|
|
|
|
self.assertEqual(0, retcode)
|
|
|
|
self.assertIn('image', control.images)
|
|
|
|
image = control.images['image']
|
|
|
|
self.assertEqual(7, image._size)
|
|
|
|
|
|
|
|
def testPackImageSizeAlign(self):
|
|
|
|
"""Test that image size alignemnt works as expected"""
|
|
|
|
retcode = self._DoTestFile('18_pack_image_align.dts')
|
|
|
|
self.assertEqual(0, retcode)
|
|
|
|
self.assertIn('image', control.images)
|
|
|
|
image = control.images['image']
|
|
|
|
self.assertEqual(16, image._size)
|
|
|
|
|
|
|
|
def testPackInvalidImageAlign(self):
|
|
|
|
"""Test that invalid image alignment is detected"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoTestFile('19_pack_inv_image_align.dts')
|
2018-06-01 15:38:12 +00:00
|
|
|
self.assertIn("Section '/binman': Size 0x7 (7) does not match "
|
2016-11-26 03:15:52 +00:00
|
|
|
"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')
|
2018-06-01 15:38:12 +00:00
|
|
|
self.assertIn("Section '/binman': Alignment size 131 must be a power of "
|
2016-11-26 03:15:52 +00:00
|
|
|
"two", str(e.exception))
|
|
|
|
|
|
|
|
def testImagePadByte(self):
|
|
|
|
"""Test that the image pad byte can be specified"""
|
binman: Support accessing binman tables at run time
Binman construct images consisting of multiple binary files. These files
sometimes need to know (at run timme) where their peers are located. For
example, SPL may want to know where U-Boot is located in the image, so
that it can jump to U-Boot correctly on boot.
In general the positions where the binaries end up after binman has
finished packing them cannot be known at compile time. One reason for
this is that binman does not know the size of the binaries until
everything is compiled, linked and converted to binaries with objcopy.
To make this work, we add a feature to binman which checks each binary
for symbol names starting with '_binman'. These are then decoded to figure
out which entry and property they refer to. Then binman writes the value
of this symbol into the appropriate binary. With this, the symbol will
have the correct value at run time.
Macros are used to make this easier to use. As an example, this declares
a symbol that will access the 'u-boot-spl' entry to find the 'pos' value
(i.e. the position of SPL in the image):
binman_sym_declare(unsigned long, u_boot_spl, pos);
This converts to a symbol called '_binman_u_boot_spl_prop_pos' in any
binary that includes it. Binman then updates the value in that binary,
ensuring that it can be accessed at runtime with:
ulong u_boot_pos = binman_sym(ulong, u_boot_spl, pos);
This assigns the variable u_boot_pos to the position of SPL in the image.
Signed-off-by: Simon Glass <sjg@chromium.org>
2017-11-14 01:55:01 +00:00
|
|
|
with open(self.TestFile('bss_data')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read())
|
2016-11-26 03:15:52 +00:00
|
|
|
data = self._DoReadFile('21_image_pad.dts')
|
2017-11-14 01:54:59 +00:00
|
|
|
self.assertEqual(U_BOOT_SPL_DATA + (chr(0xff) * 1) + U_BOOT_DATA, data)
|
2016-11-26 03:15:52 +00:00
|
|
|
|
|
|
|
def testImageName(self):
|
|
|
|
"""Test that image files can be named"""
|
|
|
|
retcode = self._DoTestFile('22_image_name.dts')
|
|
|
|
self.assertEqual(0, retcode)
|
|
|
|
image = control.images['image1']
|
|
|
|
fname = tools.GetOutputFilename('test-name')
|
|
|
|
self.assertTrue(os.path.exists(fname))
|
|
|
|
|
|
|
|
image = control.images['image2']
|
|
|
|
fname = tools.GetOutputFilename('test-name.xx')
|
|
|
|
self.assertTrue(os.path.exists(fname))
|
|
|
|
|
|
|
|
def testBlobFilename(self):
|
|
|
|
"""Test that generic blobs can be provided by filename"""
|
|
|
|
data = self._DoReadFile('23_blob.dts')
|
|
|
|
self.assertEqual(BLOB_DATA, data)
|
|
|
|
|
|
|
|
def testPackSorted(self):
|
|
|
|
"""Test that entries can be sorted"""
|
|
|
|
data = self._DoReadFile('24_sorted.dts')
|
2017-11-14 01:54:59 +00:00
|
|
|
self.assertEqual(chr(0) * 1 + U_BOOT_SPL_DATA + chr(0) * 2 +
|
2016-11-26 03:15:52 +00:00
|
|
|
U_BOOT_DATA, data)
|
|
|
|
|
2018-08-01 21:22:37 +00:00
|
|
|
def testPackZeroOffset(self):
|
|
|
|
"""Test that an entry at offset 0 is not given a new offset"""
|
2016-11-26 03:15:52 +00:00
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoTestFile('25_pack_zero_size.dts')
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertIn("Node '/binman/u-boot-spl': Offset 0x0 (0) overlaps "
|
2016-11-26 03:15:52 +00:00
|
|
|
"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')
|
|
|
|
self.assertEqual(U_BOOT_NODTB_DATA + U_BOOT_DTB_DATA, data)
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
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')
|
2018-06-01 15:38:12 +00:00
|
|
|
self.assertIn("Section '/binman': Section size must be provided when "
|
2016-11-26 03:15:53 +00:00
|
|
|
"using end-at-4gb", str(e.exception))
|
|
|
|
|
2018-09-03 16:05:07 +00:00
|
|
|
def test4gbAndSkipAtStartTogether(self):
|
|
|
|
"""Test that the end-at-4gb and skip-at-size property can't be used
|
|
|
|
together"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoTestFile('80_4gb_and_skip_at_start_together.dts')
|
|
|
|
self.assertIn("Section '/binman': Provide either 'end-at-4gb' or "
|
|
|
|
"'skip-at-start'", str(e.exception))
|
|
|
|
|
2016-11-26 03:15:53 +00:00
|
|
|
def testPackX86RomOutside(self):
|
2018-08-01 21:22:37 +00:00
|
|
|
"""Test that the end-at-4gb property checks for offset boundaries"""
|
2016-11-26 03:15:53 +00:00
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoTestFile('28_pack_4gb_outside.dts')
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertIn("Node '/binman/u-boot': Offset 0x0 (0) is outside "
|
2018-06-01 15:38:12 +00:00
|
|
|
"the section starting at 0xffffffe0 (4294967264)",
|
2016-11-26 03:15:53 +00:00
|
|
|
str(e.exception))
|
|
|
|
|
|
|
|
def testPackX86Rom(self):
|
|
|
|
"""Test that a basic x86 ROM can be created"""
|
|
|
|
data = self._DoReadFile('29_x86-rom.dts')
|
2017-11-14 01:54:59 +00:00
|
|
|
self.assertEqual(U_BOOT_DATA + chr(0) * 7 + U_BOOT_SPL_DATA +
|
|
|
|
chr(0) * 2, data)
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
def testPackX86RomMeNoDesc(self):
|
|
|
|
"""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.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')
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertIn("Node '/binman/intel-me': No offset set with "
|
|
|
|
"offset-unset: should another entry provide this correct "
|
|
|
|
"offset?", str(e.exception))
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
def testPackX86RomMe(self):
|
|
|
|
"""Test that an x86 ROM with an ME region can be created"""
|
|
|
|
data = self._DoReadFile('31_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')
|
|
|
|
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')
|
|
|
|
self.assertEqual(X86_START16_DATA, data[:len(X86_START16_DATA)])
|
|
|
|
|
2018-07-06 16:27:17 +00:00
|
|
|
def _RunMicrocodeTest(self, dts_fname, nodtb_data, ucode_second=False):
|
2018-07-06 16:27:16 +00:00
|
|
|
"""Handle running a test for insertion of microcode
|
|
|
|
|
|
|
|
Args:
|
|
|
|
dts_fname: Name of test .dts file
|
|
|
|
nodtb_data: Data that we expect in the first section
|
2018-07-06 16:27:17 +00:00
|
|
|
ucode_second: True if the microsecond entry is second instead of
|
|
|
|
third
|
2018-07-06 16:27:16 +00:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
Tuple:
|
|
|
|
Contents of first region (U-Boot or SPL)
|
2018-08-01 21:22:37 +00:00
|
|
|
Offset and size components of microcode pointer, as inserted
|
2018-07-06 16:27:16 +00:00
|
|
|
in the above (two 4-byte words)
|
|
|
|
"""
|
2017-11-13 04:52:27 +00:00
|
|
|
data = self._DoReadFile(dts_fname, True)
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
# Now check the device tree has no microcode
|
2018-07-06 16:27:17 +00:00
|
|
|
if ucode_second:
|
|
|
|
ucode_content = data[len(nodtb_data):]
|
|
|
|
ucode_pos = len(nodtb_data)
|
|
|
|
dtb_with_ucode = ucode_content[16:]
|
|
|
|
fdt_len = self.GetFdtLen(dtb_with_ucode)
|
|
|
|
else:
|
|
|
|
dtb_with_ucode = data[len(nodtb_data):]
|
|
|
|
fdt_len = self.GetFdtLen(dtb_with_ucode)
|
|
|
|
ucode_content = dtb_with_ucode[fdt_len:]
|
|
|
|
ucode_pos = len(nodtb_data) + fdt_len
|
2016-11-26 03:15:53 +00:00
|
|
|
fname = tools.GetOutputFilename('test.dtb')
|
|
|
|
with open(fname, 'wb') as fd:
|
2018-07-06 16:27:16 +00:00
|
|
|
fd.write(dtb_with_ucode)
|
2017-05-27 13:38:29 +00:00
|
|
|
dtb = fdt.FdtScan(fname)
|
|
|
|
ucode = dtb.GetNode('/microcode')
|
2016-11-26 03:15:53 +00:00
|
|
|
self.assertTrue(ucode)
|
|
|
|
for node in ucode.subnodes:
|
|
|
|
self.assertFalse(node.props.get('data'))
|
|
|
|
|
|
|
|
# Check that the microcode appears immediately after the Fdt
|
|
|
|
# This matches the concatenation of the data properties in
|
2017-11-13 04:52:26 +00:00
|
|
|
# the /microcode/update@xxx nodes in 34_x86_ucode.dts.
|
2016-11-26 03:15:53 +00:00
|
|
|
ucode_data = struct.pack('>4L', 0x12345678, 0x12345679, 0xabcd0000,
|
|
|
|
0x78235609)
|
2018-07-06 16:27:16 +00:00
|
|
|
self.assertEqual(ucode_data, ucode_content[:len(ucode_data)])
|
2016-11-26 03:15:53 +00:00
|
|
|
|
|
|
|
# Check that the microcode pointer was inserted. It should match the
|
2018-08-01 21:22:37 +00:00
|
|
|
# expected offset and size
|
2016-11-26 03:15:53 +00:00
|
|
|
pos_and_size = struct.pack('<2L', 0xfffffe00 + ucode_pos,
|
|
|
|
len(ucode_data))
|
2018-07-06 16:27:17 +00:00
|
|
|
u_boot = data[:len(nodtb_data)]
|
|
|
|
return u_boot, pos_and_size
|
2017-11-13 04:52:27 +00:00
|
|
|
|
|
|
|
def testPackUbootMicrocode(self):
|
|
|
|
"""Test that x86 microcode can be handled correctly
|
|
|
|
|
|
|
|
We expect to see the following in the image, in order:
|
|
|
|
u-boot-nodtb.bin with a microcode pointer inserted at the correct
|
|
|
|
place
|
|
|
|
u-boot.dtb with the microcode removed
|
|
|
|
the microcode
|
|
|
|
"""
|
|
|
|
first, pos_and_size = self._RunMicrocodeTest('34_x86_ucode.dts',
|
|
|
|
U_BOOT_NODTB_DATA)
|
2016-11-26 03:15:53 +00:00
|
|
|
self.assertEqual('nodtb with microcode' + pos_and_size +
|
|
|
|
' somewhere in here', first)
|
|
|
|
|
2017-05-27 13:38:26 +00:00
|
|
|
def _RunPackUbootSingleMicrocode(self):
|
2016-11-26 03:15:53 +00:00
|
|
|
"""Test that x86 microcode can be handled correctly
|
|
|
|
|
|
|
|
We expect to see the following in the image, in order:
|
|
|
|
u-boot-nodtb.bin with a microcode pointer inserted at the correct
|
|
|
|
place
|
|
|
|
u-boot.dtb with the microcode
|
|
|
|
an empty microcode region
|
|
|
|
"""
|
|
|
|
# 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)
|
|
|
|
|
|
|
|
second = data[len(U_BOOT_NODTB_DATA):]
|
|
|
|
|
|
|
|
fdt_len = self.GetFdtLen(second)
|
|
|
|
third = second[fdt_len:]
|
|
|
|
second = second[:fdt_len]
|
|
|
|
|
2017-05-27 13:38:26 +00:00
|
|
|
ucode_data = struct.pack('>2L', 0x12345678, 0x12345679)
|
|
|
|
self.assertIn(ucode_data, second)
|
|
|
|
ucode_pos = second.find(ucode_data) + len(U_BOOT_NODTB_DATA)
|
2016-11-26 03:15:53 +00:00
|
|
|
|
2017-05-27 13:38:26 +00:00
|
|
|
# Check that the microcode pointer was inserted. It should match the
|
2018-08-01 21:22:37 +00:00
|
|
|
# expected offset and size
|
2017-05-27 13:38:26 +00:00
|
|
|
pos_and_size = struct.pack('<2L', 0xfffffe00 + ucode_pos,
|
|
|
|
len(ucode_data))
|
|
|
|
first = data[:len(U_BOOT_NODTB_DATA)]
|
|
|
|
self.assertEqual('nodtb with microcode' + pos_and_size +
|
|
|
|
' somewhere in here', first)
|
2016-11-26 03:15:54 +00:00
|
|
|
|
2016-11-26 03:15:55 +00:00
|
|
|
def testPackUbootSingleMicrocode(self):
|
|
|
|
"""Test that x86 microcode can be handled correctly with fdt_normal.
|
|
|
|
"""
|
2017-05-27 13:38:26 +00:00
|
|
|
self._RunPackUbootSingleMicrocode()
|
2016-11-26 03:15:55 +00:00
|
|
|
|
2016-11-26 03:15:54 +00:00
|
|
|
def testUBootImg(self):
|
|
|
|
"""Test that u-boot.img can be put in a file"""
|
|
|
|
data = self._DoReadFile('36_u_boot_img.dts')
|
|
|
|
self.assertEqual(U_BOOT_IMG_DATA, data)
|
2016-11-26 03:15:55 +00:00
|
|
|
|
|
|
|
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.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.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.assertIn("Node '/binman/u-boot-with-ucode-ptr': Cannot find "
|
|
|
|
"microcode region u-boot-ucode", str(e.exception))
|
|
|
|
|
|
|
|
def testMicrocodeWithoutPtrInElf(self):
|
|
|
|
"""Test that a U-Boot binary without the microcode symbol is detected"""
|
|
|
|
# ELF file without a '_dt_ucode_base_size' symbol
|
|
|
|
try:
|
|
|
|
with open(self.TestFile('u_boot_no_ucode_ptr')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('u-boot', fd.read())
|
|
|
|
|
|
|
|
with self.assertRaises(ValueError) as e:
|
2017-05-27 13:38:26 +00:00
|
|
|
self._RunPackUbootSingleMicrocode()
|
2016-11-26 03:15:55 +00:00
|
|
|
self.assertIn("Node '/binman/u-boot-with-ucode-ptr': Cannot locate "
|
|
|
|
"_dt_ucode_base_size symbol in u-boot", str(e.exception))
|
|
|
|
|
|
|
|
finally:
|
|
|
|
# Put the original file back
|
|
|
|
with open(self.TestFile('u_boot_ucode_ptr')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('u-boot', fd.read())
|
|
|
|
|
|
|
|
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.assertIn("Node '/binman/u-boot-with-ucode-ptr': Microcode "
|
|
|
|
"pointer _dt_ucode_base_size at fffffe14 is outside the "
|
2018-06-01 15:38:14 +00:00
|
|
|
"section ranging from 00000000 to 0000002e", str(e.exception))
|
2016-11-26 03:15:55 +00:00
|
|
|
|
|
|
|
def testWithoutMicrocode(self):
|
|
|
|
"""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())
|
2018-07-06 16:27:42 +00:00
|
|
|
data, dtb, _, _ = self._DoReadFileDtb('44_x86_optional_ucode.dts', True)
|
2016-11-26 03:15:55 +00:00
|
|
|
|
|
|
|
# Now check the device tree has no microcode
|
|
|
|
self.assertEqual(U_BOOT_NODTB_DATA, data[:len(U_BOOT_NODTB_DATA)])
|
|
|
|
second = data[len(U_BOOT_NODTB_DATA):]
|
|
|
|
|
|
|
|
fdt_len = self.GetFdtLen(second)
|
|
|
|
self.assertEqual(dtb, second[:fdt_len])
|
|
|
|
|
|
|
|
used_len = len(U_BOOT_NODTB_DATA) + fdt_len
|
|
|
|
third = data[used_len:]
|
|
|
|
self.assertEqual(chr(0) * (0x200 - used_len), third)
|
|
|
|
|
|
|
|
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)
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertIn("Section '/binman': Unable to set offset/size for unknown "
|
2016-11-26 03:15:55 +00:00
|
|
|
"entry 'invalid-entry'", str(e.exception))
|
2016-11-26 03:15:56 +00:00
|
|
|
|
|
|
|
def testPackFsp(self):
|
|
|
|
"""Test that an image with a FSP binary can be created"""
|
|
|
|
data = self._DoReadFile('42_intel-fsp.dts')
|
|
|
|
self.assertEqual(FSP_DATA, data[:len(FSP_DATA)])
|
|
|
|
|
|
|
|
def testPackCmc(self):
|
2017-08-16 05:41:54 +00:00
|
|
|
"""Test that an image with a CMC binary can be created"""
|
2016-11-26 03:15:56 +00:00
|
|
|
data = self._DoReadFile('43_intel-cmc.dts')
|
|
|
|
self.assertEqual(CMC_DATA, data[:len(CMC_DATA)])
|
2017-08-16 05:41:54 +00:00
|
|
|
|
|
|
|
def testPackVbt(self):
|
|
|
|
"""Test that an image with a VBT binary can be created"""
|
|
|
|
data = self._DoReadFile('46_intel-vbt.dts')
|
|
|
|
self.assertEqual(VBT_DATA, data[:len(VBT_DATA)])
|
2017-11-13 04:52:22 +00:00
|
|
|
|
2017-11-13 04:52:25 +00:00
|
|
|
def testSplBssPad(self):
|
|
|
|
"""Test that we can pad SPL's BSS with zeros"""
|
2017-11-13 04:52:27 +00:00
|
|
|
# ELF file with a '__bss_size' symbol
|
|
|
|
with open(self.TestFile('bss_data')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read())
|
2017-11-13 04:52:25 +00:00
|
|
|
data = self._DoReadFile('47_spl_bss_pad.dts')
|
|
|
|
self.assertEqual(U_BOOT_SPL_DATA + (chr(0) * 10) + U_BOOT_DATA, data)
|
|
|
|
|
2017-11-14 01:54:54 +00:00
|
|
|
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.assertIn('Expected __bss_size symbol in spl/u-boot-spl',
|
|
|
|
str(e.exception))
|
|
|
|
|
2017-11-13 04:52:26 +00:00
|
|
|
def testPackStart16Spl(self):
|
|
|
|
"""Test that an image with an x86 start16 region can be created"""
|
|
|
|
data = self._DoReadFile('48_x86-start16-spl.dts')
|
|
|
|
self.assertEqual(X86_START16_SPL_DATA, data[:len(X86_START16_SPL_DATA)])
|
|
|
|
|
2018-07-06 16:27:17 +00:00
|
|
|
def _PackUbootSplMicrocode(self, dts, ucode_second=False):
|
|
|
|
"""Helper function for microcode tests
|
2017-11-13 04:52:27 +00:00
|
|
|
|
|
|
|
We expect to see the following in the image, in order:
|
|
|
|
u-boot-spl-nodtb.bin with a microcode pointer inserted at the
|
|
|
|
correct place
|
|
|
|
u-boot.dtb with the microcode removed
|
|
|
|
the microcode
|
2018-07-06 16:27:17 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
dts: Device tree file to use for test
|
|
|
|
ucode_second: True if the microsecond entry is second instead of
|
|
|
|
third
|
2017-11-13 04:52:27 +00:00
|
|
|
"""
|
|
|
|
# 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())
|
2018-07-06 16:27:17 +00:00
|
|
|
first, pos_and_size = self._RunMicrocodeTest(dts, U_BOOT_SPL_NODTB_DATA,
|
|
|
|
ucode_second=ucode_second)
|
2017-11-13 04:52:27 +00:00
|
|
|
self.assertEqual('splnodtb with microc' + pos_and_size +
|
|
|
|
'ter somewhere in here', first)
|
|
|
|
|
2018-07-06 16:27:17 +00:00
|
|
|
def testPackUbootSplMicrocode(self):
|
|
|
|
"""Test that x86 microcode can be handled correctly in SPL"""
|
|
|
|
self._PackUbootSplMicrocode('49_x86_ucode_spl.dts')
|
|
|
|
|
|
|
|
def testPackUbootSplMicrocodeReorder(self):
|
|
|
|
"""Test that order doesn't matter for microcode entries
|
|
|
|
|
|
|
|
This is the same as testPackUbootSplMicrocode but when we process the
|
|
|
|
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',
|
|
|
|
ucode_second=True)
|
|
|
|
|
2017-11-13 04:52:28 +00:00
|
|
|
def testPackMrc(self):
|
|
|
|
"""Test that an image with an MRC binary can be created"""
|
|
|
|
data = self._DoReadFile('50_intel_mrc.dts')
|
|
|
|
self.assertEqual(MRC_DATA, data[:len(MRC_DATA)])
|
|
|
|
|
2017-11-14 01:54:55 +00:00
|
|
|
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')
|
|
|
|
self.assertEqual(U_BOOT_SPL_DTB_DATA, data[:len(U_BOOT_SPL_DTB_DATA)])
|
|
|
|
|
2017-11-14 01:54:56 +00:00
|
|
|
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')
|
|
|
|
self.assertEqual(U_BOOT_SPL_NODTB_DATA, data[:len(U_BOOT_SPL_NODTB_DATA)])
|
|
|
|
|
binman: Support accessing binman tables at run time
Binman construct images consisting of multiple binary files. These files
sometimes need to know (at run timme) where their peers are located. For
example, SPL may want to know where U-Boot is located in the image, so
that it can jump to U-Boot correctly on boot.
In general the positions where the binaries end up after binman has
finished packing them cannot be known at compile time. One reason for
this is that binman does not know the size of the binaries until
everything is compiled, linked and converted to binaries with objcopy.
To make this work, we add a feature to binman which checks each binary
for symbol names starting with '_binman'. These are then decoded to figure
out which entry and property they refer to. Then binman writes the value
of this symbol into the appropriate binary. With this, the symbol will
have the correct value at run time.
Macros are used to make this easier to use. As an example, this declares
a symbol that will access the 'u-boot-spl' entry to find the 'pos' value
(i.e. the position of SPL in the image):
binman_sym_declare(unsigned long, u_boot_spl, pos);
This converts to a symbol called '_binman_u_boot_spl_prop_pos' in any
binary that includes it. Binman then updates the value in that binary,
ensuring that it can be accessed at runtime with:
ulong u_boot_pos = binman_sym(ulong, u_boot_spl, pos);
This assigns the variable u_boot_pos to the position of SPL in the image.
Signed-off-by: Simon Glass <sjg@chromium.org>
2017-11-14 01:55:01 +00:00
|
|
|
def testSymbols(self):
|
|
|
|
"""Test binman can assign symbols embedded in U-Boot"""
|
|
|
|
elf_fname = self.TestFile('u_boot_binman_syms')
|
|
|
|
syms = elf.GetSymbols(elf_fname, ['binman', 'image'])
|
|
|
|
addr = elf.GetSymbolAddress(elf_fname, '__image_copy_start')
|
2018-08-01 21:22:37 +00:00
|
|
|
self.assertEqual(syms['_binman_u_boot_spl_prop_offset'].address, addr)
|
binman: Support accessing binman tables at run time
Binman construct images consisting of multiple binary files. These files
sometimes need to know (at run timme) where their peers are located. For
example, SPL may want to know where U-Boot is located in the image, so
that it can jump to U-Boot correctly on boot.
In general the positions where the binaries end up after binman has
finished packing them cannot be known at compile time. One reason for
this is that binman does not know the size of the binaries until
everything is compiled, linked and converted to binaries with objcopy.
To make this work, we add a feature to binman which checks each binary
for symbol names starting with '_binman'. These are then decoded to figure
out which entry and property they refer to. Then binman writes the value
of this symbol into the appropriate binary. With this, the symbol will
have the correct value at run time.
Macros are used to make this easier to use. As an example, this declares
a symbol that will access the 'u-boot-spl' entry to find the 'pos' value
(i.e. the position of SPL in the image):
binman_sym_declare(unsigned long, u_boot_spl, pos);
This converts to a symbol called '_binman_u_boot_spl_prop_pos' in any
binary that includes it. Binman then updates the value in that binary,
ensuring that it can be accessed at runtime with:
ulong u_boot_pos = binman_sym(ulong, u_boot_spl, pos);
This assigns the variable u_boot_pos to the position of SPL in the image.
Signed-off-by: Simon Glass <sjg@chromium.org>
2017-11-14 01:55:01 +00:00
|
|
|
|
|
|
|
with open(self.TestFile('u_boot_binman_syms')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('spl/u-boot-spl', fd.read())
|
|
|
|
data = self._DoReadFile('53_symbols.dts')
|
|
|
|
sym_values = struct.pack('<LQL', 0x24 + 0, 0x24 + 24, 0x24 + 20)
|
|
|
|
expected = (sym_values + U_BOOT_SPL_DATA[16:] + chr(0xff) +
|
|
|
|
U_BOOT_DATA +
|
|
|
|
sym_values + U_BOOT_SPL_DATA[16:])
|
|
|
|
self.assertEqual(expected, data)
|
|
|
|
|
2018-06-01 15:38:11 +00:00
|
|
|
def testPackUnitAddress(self):
|
|
|
|
"""Test that we support multiple binaries with the same name"""
|
|
|
|
data = self._DoReadFile('54_unit_address.dts')
|
|
|
|
self.assertEqual(U_BOOT_DATA + U_BOOT_DATA, data)
|
|
|
|
|
2018-06-01 15:38:16 +00:00
|
|
|
def testSections(self):
|
|
|
|
"""Basic test of sections"""
|
|
|
|
data = self._DoReadFile('55_sections.dts')
|
2018-07-17 19:25:28 +00:00
|
|
|
expected = (U_BOOT_DATA + '!' * 12 + U_BOOT_DATA + 'a' * 12 +
|
|
|
|
U_BOOT_DATA + '&' * 4)
|
2018-06-01 15:38:16 +00:00
|
|
|
self.assertEqual(expected, data)
|
2017-11-13 04:52:22 +00:00
|
|
|
|
2018-06-01 15:38:20 +00:00
|
|
|
def testMap(self):
|
|
|
|
"""Tests outputting a map of the images"""
|
2018-07-06 16:27:42 +00:00
|
|
|
_, _, map_data, _ = self._DoReadFileDtb('55_sections.dts', map=True)
|
2018-07-17 19:25:49 +00:00
|
|
|
self.assertEqual('''ImagePos Offset Size Name
|
|
|
|
00000000 00000000 00000028 main-section
|
|
|
|
00000000 00000000 00000010 section@0
|
|
|
|
00000000 00000000 00000004 u-boot
|
|
|
|
00000010 00000010 00000010 section@1
|
|
|
|
00000010 00000000 00000004 u-boot
|
|
|
|
00000020 00000020 00000004 section@2
|
|
|
|
00000020 00000000 00000004 u-boot
|
2018-06-01 15:38:20 +00:00
|
|
|
''', map_data)
|
|
|
|
|
2018-06-01 15:38:21 +00:00
|
|
|
def testNamePrefix(self):
|
|
|
|
"""Tests that name prefixes are used"""
|
2018-07-06 16:27:42 +00:00
|
|
|
_, _, map_data, _ = self._DoReadFileDtb('56_name_prefix.dts', map=True)
|
2018-07-17 19:25:49 +00:00
|
|
|
self.assertEqual('''ImagePos Offset Size Name
|
|
|
|
00000000 00000000 00000028 main-section
|
|
|
|
00000000 00000000 00000010 section@0
|
|
|
|
00000000 00000000 00000004 ro-u-boot
|
|
|
|
00000010 00000010 00000010 section@1
|
|
|
|
00000010 00000000 00000004 rw-u-boot
|
2018-06-01 15:38:21 +00:00
|
|
|
''', map_data)
|
|
|
|
|
2018-07-06 16:27:17 +00:00
|
|
|
def testUnknownContents(self):
|
|
|
|
"""Test that obtaining the contents works as expected"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFile('57_unknown_contents.dts', True)
|
|
|
|
self.assertIn("Section '/binman': Internal error: Could not complete "
|
|
|
|
"processing of contents: remaining [<_testing.Entry__testing ",
|
|
|
|
str(e.exception))
|
|
|
|
|
2018-07-06 16:27:19 +00:00
|
|
|
def testBadChangeSize(self):
|
|
|
|
"""Test that trying to change the size of an entry fails"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFile('59_change_size.dts', True)
|
|
|
|
self.assertIn("Node '/binman/_testing': Cannot update entry size from "
|
|
|
|
'2 to 1', str(e.exception))
|
|
|
|
|
2018-07-06 16:27:42 +00:00
|
|
|
def testUpdateFdt(self):
|
2018-08-01 21:22:37 +00:00
|
|
|
"""Test that we can update the device tree with offset/size info"""
|
2018-07-06 16:27:42 +00:00
|
|
|
_, _, _, out_dtb_fname = self._DoReadFileDtb('60_fdt_update.dts',
|
|
|
|
update_dtb=True)
|
2018-07-17 19:25:52 +00:00
|
|
|
dtb = fdt.Fdt(out_dtb_fname)
|
|
|
|
dtb.Scan()
|
|
|
|
props = self._GetPropTree(dtb, ['offset', 'size', 'image-pos'])
|
2018-07-06 16:27:42 +00:00
|
|
|
self.assertEqual({
|
2018-08-01 21:22:42 +00:00
|
|
|
'image-pos': 0,
|
2018-07-17 19:25:28 +00:00
|
|
|
'offset': 0,
|
2018-08-01 21:22:37 +00:00
|
|
|
'_testing:offset': 32,
|
2018-07-06 16:27:42 +00:00
|
|
|
'_testing:size': 1,
|
2018-08-01 21:22:42 +00:00
|
|
|
'_testing:image-pos': 32,
|
2018-08-01 21:22:37 +00:00
|
|
|
'section@0/u-boot:offset': 0,
|
2018-07-06 16:27:42 +00:00
|
|
|
'section@0/u-boot:size': len(U_BOOT_DATA),
|
2018-08-01 21:22:42 +00:00
|
|
|
'section@0/u-boot:image-pos': 0,
|
2018-08-01 21:22:37 +00:00
|
|
|
'section@0:offset': 0,
|
2018-07-06 16:27:42 +00:00
|
|
|
'section@0:size': 16,
|
2018-08-01 21:22:42 +00:00
|
|
|
'section@0:image-pos': 0,
|
2018-07-06 16:27:42 +00:00
|
|
|
|
2018-08-01 21:22:37 +00:00
|
|
|
'section@1/u-boot:offset': 0,
|
2018-07-06 16:27:42 +00:00
|
|
|
'section@1/u-boot:size': len(U_BOOT_DATA),
|
2018-08-01 21:22:42 +00:00
|
|
|
'section@1/u-boot:image-pos': 16,
|
2018-08-01 21:22:37 +00:00
|
|
|
'section@1:offset': 16,
|
2018-07-06 16:27:42 +00:00
|
|
|
'section@1:size': 16,
|
2018-08-01 21:22:42 +00:00
|
|
|
'section@1:image-pos': 16,
|
2018-07-06 16:27:42 +00:00
|
|
|
'size': 40
|
|
|
|
}, props)
|
|
|
|
|
|
|
|
def testUpdateFdtBad(self):
|
|
|
|
"""Test that we detect when ProcessFdt never completes"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFileDtb('61_fdt_update_bad.dts', update_dtb=True)
|
|
|
|
self.assertIn('Could not complete processing of Fdt: remaining '
|
|
|
|
'[<_testing.Entry__testing', str(e.exception))
|
2018-07-06 16:27:19 +00:00
|
|
|
|
2018-07-17 19:25:32 +00:00
|
|
|
def testEntryArgs(self):
|
|
|
|
"""Test passing arguments to entries from the command line"""
|
|
|
|
entry_args = {
|
|
|
|
'test-str-arg': 'test1',
|
|
|
|
'test-int-arg': '456',
|
|
|
|
}
|
|
|
|
self._DoReadFileDtb('62_entry_args.dts', entry_args=entry_args)
|
|
|
|
self.assertIn('image', control.images)
|
|
|
|
entry = control.images['image'].GetEntries()['_testing']
|
|
|
|
self.assertEqual('test0', entry.test_str_fdt)
|
|
|
|
self.assertEqual('test1', entry.test_str_arg)
|
|
|
|
self.assertEqual(123, entry.test_int_fdt)
|
|
|
|
self.assertEqual(456, entry.test_int_arg)
|
|
|
|
|
|
|
|
def testEntryArgsMissing(self):
|
|
|
|
"""Test missing arguments and properties"""
|
|
|
|
entry_args = {
|
|
|
|
'test-int-arg': '456',
|
|
|
|
}
|
|
|
|
self._DoReadFileDtb('63_entry_args_missing.dts', entry_args=entry_args)
|
|
|
|
entry = control.images['image'].GetEntries()['_testing']
|
|
|
|
self.assertEqual('test0', entry.test_str_fdt)
|
|
|
|
self.assertEqual(None, entry.test_str_arg)
|
|
|
|
self.assertEqual(None, entry.test_int_fdt)
|
|
|
|
self.assertEqual(456, entry.test_int_arg)
|
|
|
|
|
|
|
|
def testEntryArgsRequired(self):
|
|
|
|
"""Test missing arguments and properties"""
|
|
|
|
entry_args = {
|
|
|
|
'test-int-arg': '456',
|
|
|
|
}
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFileDtb('64_entry_args_required.dts')
|
|
|
|
self.assertIn("Node '/binman/_testing': Missing required "
|
|
|
|
'properties/entry args: test-str-arg, test-int-fdt, test-int-arg',
|
|
|
|
str(e.exception))
|
|
|
|
|
|
|
|
def testEntryArgsInvalidFormat(self):
|
|
|
|
"""Test that an invalid entry-argument format is detected"""
|
|
|
|
args = ['-d', self.TestFile('64_entry_args_required.dts'), '-ano-value']
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoBinman(*args)
|
|
|
|
self.assertIn("Invalid entry arguemnt 'no-value'", str(e.exception))
|
|
|
|
|
|
|
|
def testEntryArgsInvalidInteger(self):
|
|
|
|
"""Test that an invalid entry-argument integer is detected"""
|
|
|
|
entry_args = {
|
|
|
|
'test-int-arg': 'abc',
|
|
|
|
}
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFileDtb('62_entry_args.dts', entry_args=entry_args)
|
|
|
|
self.assertIn("Node '/binman/_testing': Cannot convert entry arg "
|
|
|
|
"'test-int-arg' (value 'abc') to integer",
|
|
|
|
str(e.exception))
|
|
|
|
|
|
|
|
def testEntryArgsInvalidDatatype(self):
|
|
|
|
"""Test that an invalid entry-argument datatype is detected
|
|
|
|
|
|
|
|
This test could be written in entry_test.py except that it needs
|
|
|
|
access to control.entry_args, which seems more than that module should
|
|
|
|
be able to see.
|
|
|
|
"""
|
|
|
|
entry_args = {
|
|
|
|
'test-bad-datatype-arg': '12',
|
|
|
|
}
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFileDtb('65_entry_args_unknown_datatype.dts',
|
|
|
|
entry_args=entry_args)
|
|
|
|
self.assertIn('GetArg() internal error: Unknown data type ',
|
|
|
|
str(e.exception))
|
|
|
|
|
2018-07-17 19:25:33 +00:00
|
|
|
def testText(self):
|
|
|
|
"""Test for a text entry type"""
|
|
|
|
entry_args = {
|
|
|
|
'test-id': TEXT_DATA,
|
|
|
|
'test-id2': TEXT_DATA2,
|
|
|
|
'test-id3': TEXT_DATA3,
|
|
|
|
}
|
|
|
|
data, _, _, _ = self._DoReadFileDtb('66_text.dts',
|
|
|
|
entry_args=entry_args)
|
|
|
|
expected = (TEXT_DATA + chr(0) * (8 - len(TEXT_DATA)) + TEXT_DATA2 +
|
|
|
|
TEXT_DATA3 + 'some text')
|
|
|
|
self.assertEqual(expected, data)
|
|
|
|
|
2018-07-17 19:25:36 +00:00
|
|
|
def testEntryDocs(self):
|
|
|
|
"""Test for creation of entry documentation"""
|
|
|
|
with test_util.capture_sys_output() as (stdout, stderr):
|
|
|
|
control.WriteEntryDocs(binman.GetEntryModules())
|
|
|
|
self.assertTrue(len(stdout.getvalue()) > 0)
|
|
|
|
|
|
|
|
def testEntryDocsMissing(self):
|
|
|
|
"""Test handling of missing entry documentation"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
with test_util.capture_sys_output() as (stdout, stderr):
|
|
|
|
control.WriteEntryDocs(binman.GetEntryModules(), 'u_boot')
|
|
|
|
self.assertIn('Documentation is missing for modules: u_boot',
|
|
|
|
str(e.exception))
|
|
|
|
|
2018-07-17 19:25:38 +00:00
|
|
|
def testFmap(self):
|
|
|
|
"""Basic test of generation of a flashrom fmap"""
|
|
|
|
data = self._DoReadFile('67_fmap.dts')
|
|
|
|
fhdr, fentries = fmap_util.DecodeFmap(data[32:])
|
|
|
|
expected = U_BOOT_DATA + '!' * 12 + U_BOOT_DATA + 'a' * 12
|
|
|
|
self.assertEqual(expected, data[:32])
|
|
|
|
self.assertEqual('__FMAP__', fhdr.signature)
|
|
|
|
self.assertEqual(1, fhdr.ver_major)
|
|
|
|
self.assertEqual(0, fhdr.ver_minor)
|
|
|
|
self.assertEqual(0, fhdr.base)
|
|
|
|
self.assertEqual(16 + 16 +
|
|
|
|
fmap_util.FMAP_HEADER_LEN +
|
|
|
|
fmap_util.FMAP_AREA_LEN * 3, fhdr.image_size)
|
|
|
|
self.assertEqual('FMAP', fhdr.name)
|
|
|
|
self.assertEqual(3, fhdr.nareas)
|
|
|
|
for fentry in fentries:
|
|
|
|
self.assertEqual(0, fentry.flags)
|
|
|
|
|
|
|
|
self.assertEqual(0, fentries[0].offset)
|
|
|
|
self.assertEqual(4, fentries[0].size)
|
|
|
|
self.assertEqual('RO_U_BOOT', fentries[0].name)
|
|
|
|
|
|
|
|
self.assertEqual(16, fentries[1].offset)
|
|
|
|
self.assertEqual(4, fentries[1].size)
|
|
|
|
self.assertEqual('RW_U_BOOT', fentries[1].name)
|
|
|
|
|
|
|
|
self.assertEqual(32, fentries[2].offset)
|
|
|
|
self.assertEqual(fmap_util.FMAP_HEADER_LEN +
|
|
|
|
fmap_util.FMAP_AREA_LEN * 3, fentries[2].size)
|
|
|
|
self.assertEqual('FMAP', fentries[2].name)
|
|
|
|
|
2018-07-17 19:25:39 +00:00
|
|
|
def testBlobNamedByArg(self):
|
|
|
|
"""Test we can add a blob with the filename coming from an entry arg"""
|
|
|
|
entry_args = {
|
|
|
|
'cros-ec-rw-path': 'ecrw.bin',
|
|
|
|
}
|
|
|
|
data, _, _, _ = self._DoReadFileDtb('68_blob_named_by_arg.dts',
|
|
|
|
entry_args=entry_args)
|
|
|
|
|
2018-07-17 19:25:40 +00:00
|
|
|
def testFill(self):
|
|
|
|
"""Test for an fill entry type"""
|
|
|
|
data = self._DoReadFile('69_fill.dts')
|
|
|
|
expected = 8 * chr(0xff) + 8 * chr(0)
|
|
|
|
self.assertEqual(expected, data)
|
|
|
|
|
|
|
|
def testFillNoSize(self):
|
|
|
|
"""Test for an fill entry type with no size"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFile('70_fill_no_size.dts')
|
|
|
|
self.assertIn("'fill' entry must have a size property",
|
|
|
|
str(e.exception))
|
|
|
|
|
2018-07-17 19:25:44 +00:00
|
|
|
def _HandleGbbCommand(self, pipe_list):
|
|
|
|
"""Fake calls to the futility utility"""
|
|
|
|
if pipe_list[0][0] == 'futility':
|
|
|
|
fname = pipe_list[0][-1]
|
|
|
|
# Append our GBB data to the file, which will happen every time the
|
|
|
|
# futility command is called.
|
|
|
|
with open(fname, 'a') as fd:
|
|
|
|
fd.write(GBB_DATA)
|
|
|
|
return command.CommandResult()
|
|
|
|
|
|
|
|
def testGbb(self):
|
|
|
|
"""Test for the Chromium OS Google Binary Block"""
|
|
|
|
command.test_result = self._HandleGbbCommand
|
|
|
|
entry_args = {
|
|
|
|
'keydir': 'devkeys',
|
|
|
|
'bmpblk': 'bmpblk.bin',
|
|
|
|
}
|
|
|
|
data, _, _, _ = self._DoReadFileDtb('71_gbb.dts', entry_args=entry_args)
|
|
|
|
|
|
|
|
# Since futility
|
|
|
|
expected = GBB_DATA + GBB_DATA + 8 * chr(0) + (0x2180 - 16) * chr(0)
|
|
|
|
self.assertEqual(expected, data)
|
|
|
|
|
|
|
|
def testGbbTooSmall(self):
|
|
|
|
"""Test for the Chromium OS Google Binary Block being large enough"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFileDtb('72_gbb_too_small.dts')
|
|
|
|
self.assertIn("Node '/binman/gbb': GBB is too small",
|
|
|
|
str(e.exception))
|
|
|
|
|
|
|
|
def testGbbNoSize(self):
|
|
|
|
"""Test for the Chromium OS Google Binary Block having a size"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFileDtb('73_gbb_no_size.dts')
|
|
|
|
self.assertIn("Node '/binman/gbb': GBB must have a fixed size",
|
|
|
|
str(e.exception))
|
|
|
|
|
2018-07-17 19:25:47 +00:00
|
|
|
def _HandleVblockCommand(self, pipe_list):
|
|
|
|
"""Fake calls to the futility utility"""
|
|
|
|
if pipe_list[0][0] == 'futility':
|
|
|
|
fname = pipe_list[0][3]
|
|
|
|
with open(fname, 'w') as fd:
|
|
|
|
fd.write(VBLOCK_DATA)
|
|
|
|
return command.CommandResult()
|
|
|
|
|
|
|
|
def testVblock(self):
|
|
|
|
"""Test for the Chromium OS Verified Boot Block"""
|
|
|
|
command.test_result = self._HandleVblockCommand
|
|
|
|
entry_args = {
|
|
|
|
'keydir': 'devkeys',
|
|
|
|
}
|
|
|
|
data, _, _, _ = self._DoReadFileDtb('74_vblock.dts',
|
|
|
|
entry_args=entry_args)
|
|
|
|
expected = U_BOOT_DATA + VBLOCK_DATA + U_BOOT_DTB_DATA
|
|
|
|
self.assertEqual(expected, data)
|
|
|
|
|
|
|
|
def testVblockNoContent(self):
|
|
|
|
"""Test we detect a vblock which has no content to sign"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFile('75_vblock_no_content.dts')
|
|
|
|
self.assertIn("Node '/binman/vblock': Vblock must have a 'content' "
|
|
|
|
'property', str(e.exception))
|
|
|
|
|
|
|
|
def testVblockBadPhandle(self):
|
|
|
|
"""Test that we detect a vblock with an invalid phandle in contents"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFile('76_vblock_bad_phandle.dts')
|
|
|
|
self.assertIn("Node '/binman/vblock': Cannot find node for phandle "
|
|
|
|
'1000', str(e.exception))
|
|
|
|
|
|
|
|
def testVblockBadEntry(self):
|
|
|
|
"""Test that we detect an entry that points to a non-entry"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
self._DoReadFile('77_vblock_bad_entry.dts')
|
|
|
|
self.assertIn("Node '/binman/vblock': Cannot find entry for node "
|
|
|
|
"'other'", str(e.exception))
|
|
|
|
|
2018-07-17 19:25:48 +00:00
|
|
|
def testTpl(self):
|
|
|
|
"""Test that an image with TPL and ots device tree can be created"""
|
|
|
|
# ELF file with a '__bss_size' symbol
|
|
|
|
with open(self.TestFile('bss_data')) as fd:
|
|
|
|
TestFunctional._MakeInputFile('tpl/u-boot-tpl', fd.read())
|
|
|
|
data = self._DoReadFile('78_u_boot_tpl.dts')
|
|
|
|
self.assertEqual(U_BOOT_TPL_DATA + U_BOOT_TPL_DTB_DATA, data)
|
|
|
|
|
2018-07-17 19:25:51 +00:00
|
|
|
def testUsesPos(self):
|
|
|
|
"""Test that the 'pos' property cannot be used anymore"""
|
|
|
|
with self.assertRaises(ValueError) as e:
|
|
|
|
data = self._DoReadFile('79_uses_pos.dts')
|
|
|
|
self.assertIn("Node '/binman/u-boot': Please use 'offset' instead of "
|
|
|
|
"'pos'", str(e.exception))
|
|
|
|
|
2018-07-17 19:25:32 +00:00
|
|
|
|
2017-11-13 04:52:22 +00:00
|
|
|
if __name__ == "__main__":
|
|
|
|
unittest.main()
|