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

- Assorted fixes

diff --git a/MAINTAINERS b/MAINTAINERS
index 82e4159bec7fcff58689cc5dbf59e37602e4747a..1842569f242d09fa76a541cd926290a7314bd6ea 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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

diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index e19ab016217305706a1e1a16a2393a31aae8d401..6ee22d2944b5acfd9ed782979ad00775567bd58f 100644 (file)
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -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;
 

diff --git a/configs/meerkat96_defconfig b/configs/meerkat96_defconfig
index 45f12115bad75e415a04044d171924e3c0768c59..894ddc6c79a4ddecf0d7b97e1c344fabec6365c8 100644 (file)
--- a/configs/meerkat96_defconfig
+++ b/configs/meerkat96_defconfig
@@ -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

diff --git a/tools/image-host.c b/tools/image-host.c
index 9483561bfa518487366a131d81d2c94d509081f1..76a361b9d678340fb3ff1166f8619384cf98d478 100644 (file)
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -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

diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 36160a3977260ce4c5a54092007ae63b11df21ce..d8bf7fd0717fe1c405317e9e5ea95698a50ecefc 100755 (executable)
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -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):