Commit 133276f1 authored by Tom Rini's avatar Tom Rini
Browse files

Merge branch '2020-02-25-master-imports'

- Assorted fixes
parents c2358258 be06032e
...@@ -563,6 +563,7 @@ M: Heinrich Schuchardt <xypron.glpk@gmx.de> ...@@ -563,6 +563,7 @@ M: Heinrich Schuchardt <xypron.glpk@gmx.de>
R: Alexander Graf <agraf@csgraf.de> R: Alexander Graf <agraf@csgraf.de>
S: Maintained S: Maintained
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git
F: doc/api/efi.rst
F: doc/uefi/* F: doc/uefi/*
F: include/capitalization.h F: include/capitalization.h
F: include/charset.h F: include/charset.h
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <asm/gic.h> #include <asm/gic.h>
#include <asm/gic-v3.h> #include <asm/gic-v3.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/sizes.h>
static u32 lpi_id_bits; static u32 lpi_id_bits;
......
...@@ -36,7 +36,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y ...@@ -36,7 +36,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MMC_BROKEN_CD=y CONFIG_MMC_BROKEN_CD=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_FSL_ESDHC=y CONFIG_FSL_USDHC=y
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y CONFIG_PINCTRL_IMX7=y
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <bootm.h> #include <bootm.h>
#include <image.h> #include <image.h>
#include <version.h> #include <version.h>
#include <uboot_aes.h>
/** /**
* fit_set_hash_value - set hash value in requested has node * fit_set_hash_value - set hash value in requested has node
......
...@@ -295,6 +295,7 @@ To see the complete list of supported options, run ...@@ -295,6 +295,7 @@ To see the complete list of supported options, run
""" """
import asteval
import collections import collections
import copy import copy
import difflib import difflib
...@@ -808,10 +809,11 @@ def try_expand(line): ...@@ -808,10 +809,11 @@ def try_expand(line):
return line return line
try: try:
aeval = asteval.Interpreter( usersyms=SIZES, minimal=True )
cfg, val = re.split("=", line) cfg, val = re.split("=", line)
val= val.strip('\"') val= val.strip('\"')
if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val): if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val):
newval = hex(eval(val, SIZES)) newval = hex(aeval(val))
print("\tExpanded expression %s to %s" % (val, newval)) print("\tExpanded expression %s to %s" % (val, newval))
return cfg+'='+newval return cfg+'='+newval
except: except:
...@@ -1215,7 +1217,7 @@ class Slot: ...@@ -1215,7 +1217,7 @@ class Slot:
"Failed to process.\n") "Failed to process.\n")
if self.options.verbose: if self.options.verbose:
self.log += color_text(self.options.color, COLOR_LIGHT_CYAN, self.log += color_text(self.options.color, COLOR_LIGHT_CYAN,
self.ps.stderr.read()) self.ps.stderr.read().decode())
self.finish(False) self.finish(False)
def do_defconfig(self): def do_defconfig(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment