projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Convert all of our single license tags to Linux Kernel style
[oweals/u-boot.git]
/
tools
/
binman
/
etype
/
u_boot_with_ucode_ptr.py
diff --git
a/tools/binman/etype/u_boot_with_ucode_ptr.py
b/tools/binman/etype/u_boot_with_ucode_ptr.py
index 6f01adb9701892cb7277f6c115bad929e7e81939..04b9f7cf7f89c091562d39de02218a9a8c159170 100644
(file)
--- a/
tools/binman/etype/u_boot_with_ucode_ptr.py
+++ b/
tools/binman/etype/u_boot_with_ucode_ptr.py
@@
-1,14
+1,14
@@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for a U-Boot binary with an embedded microcode pointer
#
import struct
import command
# Entry-type module for a U-Boot binary with an embedded microcode pointer
#
import struct
import command
+import elf
from entry import Entry
from blob import Entry_blob
import fdt_util
from entry import Entry
from blob import Entry_blob
import fdt_util
@@
-31,11
+31,9
@@
class Entry_u_boot_with_ucode_ptr(Entry_blob):
def ObtainContents(self):
# Figure out where to put the microcode pointer
fname = tools.GetInputFilename(self.elf_fname)
def ObtainContents(self):
# Figure out where to put the microcode pointer
fname = tools.GetInputFilename(self.elf_fname)
- args = [['nm', fname], ['grep', '-w', '_dt_ucode_base_size']]
- out = (command.RunPipe(args, capture=True, raise_on_error=False).
- stdout.splitlines())
- if len(out) == 1:
- self.target_pos = int(out[0].split()[0], 16)
+ sym = elf.GetSymbolAddress(fname, '_dt_ucode_base_size')
+ if sym:
+ self.target_pos = sym
elif not fdt_util.GetBool(self._node, 'optional-ucode'):
self.Raise('Cannot locate _dt_ucode_base_size symbol in u-boot')
elif not fdt_util.GetBool(self._node, 'optional-ucode'):
self.Raise('Cannot locate _dt_ucode_base_size symbol in u-boot')