mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Merge branch '2020-02-25-master-imports'
- Assorted fixes
This commit is contained in:
commit
133276f14a
5 changed files with 7 additions and 4 deletions
|
@ -563,6 +563,7 @@ M: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
|||
R: Alexander Graf <agraf@csgraf.de>
|
||||
S: Maintained
|
||||
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git
|
||||
F: doc/api/efi.rst
|
||||
F: doc/uefi/*
|
||||
F: include/capitalization.h
|
||||
F: include/charset.h
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#include <asm/gic.h>
|
||||
#include <asm/gic-v3.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/sizes.h>
|
||||
|
||||
static u32 lpi_id_bits;
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_MMC_BROKEN_CD=y
|
||||
CONFIG_DM_MMC=y
|
||||
CONFIG_FSL_ESDHC=y
|
||||
CONFIG_FSL_USDHC=y
|
||||
CONFIG_MTD=y
|
||||
CONFIG_PINCTRL=y
|
||||
CONFIG_PINCTRL_IMX7=y
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include <bootm.h>
|
||||
#include <image.h>
|
||||
#include <version.h>
|
||||
#include <uboot_aes.h>
|
||||
|
||||
/**
|
||||
* fit_set_hash_value - set hash value in requested has node
|
||||
|
|
|
@ -295,6 +295,7 @@ To see the complete list of supported options, run
|
|||
|
||||
"""
|
||||
|
||||
import asteval
|
||||
import collections
|
||||
import copy
|
||||
import difflib
|
||||
|
@ -808,10 +809,11 @@ def try_expand(line):
|
|||
return line
|
||||
|
||||
try:
|
||||
aeval = asteval.Interpreter( usersyms=SIZES, minimal=True )
|
||||
cfg, val = re.split("=", line)
|
||||
val= val.strip('\"')
|
||||
if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val):
|
||||
newval = hex(eval(val, SIZES))
|
||||
newval = hex(aeval(val))
|
||||
print("\tExpanded expression %s to %s" % (val, newval))
|
||||
return cfg+'='+newval
|
||||
except:
|
||||
|
@ -1215,7 +1217,7 @@ class Slot:
|
|||
"Failed to process.\n")
|
||||
if self.options.verbose:
|
||||
self.log += color_text(self.options.color, COLOR_LIGHT_CYAN,
|
||||
self.ps.stderr.read())
|
||||
self.ps.stderr.read().decode())
|
||||
self.finish(False)
|
||||
|
||||
def do_defconfig(self):
|
||||
|
|
Loading…
Add table
Reference in a new issue