mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 17:10:11 +00:00
7c15013639
A recent change adjusted the symbol calculation to work on x86 but broke
it for Tegra. In fact this is because they have different needs.
On x86 devices the code is linked to a ROM address and the end-at-4gb
property is used for the image. In this case there is no need to add the
base address of the image, since the base address is already built into
the offset and image-pos properties.
On other devices we must add the base address since the offsets start at
zero.
In addition the base address is currently added to the 'offset' and 'size'
values. It should in fact only be added to 'image-pos', since 'offset' is
relative to its parent and 'size' is not actually an address. This code
should have been adjusted when support for 'image-pos' and 'size' was
added, but it was not.
To correct these problems:
- move the code that handles adding the base address to section.py, which
can check the end-at-4gb property and which property
(offset/size/image-pos) is being read
- add the base address only when needed (only for image-pos and not if the
image uses end-at-4gb)
- add a note to the documentation
- add a separate test to cover x86 behaviour
Fixes: 15c981cc (binman: Correct symbol calculation with non-zero image base)
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
44 lines
1.7 KiB
Python
44 lines
1.7 KiB
Python
# SPDX-License-Identifier: GPL-2.0+
|
|
# Copyright (c) 2017 Google, Inc
|
|
# Written by Simon Glass <sjg@chromium.org>
|
|
#
|
|
# Test for the image module
|
|
|
|
import unittest
|
|
|
|
from image import Image
|
|
from test_util import capture_sys_output
|
|
|
|
class TestImage(unittest.TestCase):
|
|
def testInvalidFormat(self):
|
|
image = Image('name', 'node', test=True)
|
|
with self.assertRaises(ValueError) as e:
|
|
image.LookupSymbol('_binman_something_prop_', False, 'msg', 0)
|
|
self.assertIn(
|
|
"msg: Symbol '_binman_something_prop_' has invalid format",
|
|
str(e.exception))
|
|
|
|
def testMissingSymbol(self):
|
|
image = Image('name', 'node', test=True)
|
|
image._entries = {}
|
|
with self.assertRaises(ValueError) as e:
|
|
image.LookupSymbol('_binman_type_prop_pname', False, 'msg', 0)
|
|
self.assertIn("msg: Entry 'type' not found in list ()",
|
|
str(e.exception))
|
|
|
|
def testMissingSymbolOptional(self):
|
|
image = Image('name', 'node', test=True)
|
|
image._entries = {}
|
|
with capture_sys_output() as (stdout, stderr):
|
|
val = image.LookupSymbol('_binman_type_prop_pname', True, 'msg', 0)
|
|
self.assertEqual(val, None)
|
|
self.assertEqual("Warning: msg: Entry 'type' not found in list ()\n",
|
|
stderr.getvalue())
|
|
self.assertEqual('', stdout.getvalue())
|
|
|
|
def testBadProperty(self):
|
|
image = Image('name', 'node', test=True)
|
|
image._entries = {'u-boot': 1}
|
|
with self.assertRaises(ValueError) as e:
|
|
image.LookupSymbol('_binman_u_boot_prop_bad', False, 'msg', 0)
|
|
self.assertIn("msg: No such property 'bad", str(e.exception))
|