diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-25 13:59:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-25 13:59:21 -0500 |
| commit | 133276f14acfbad4268acd19a70d3cda0a60b5e3 (patch) | |
| tree | f8ecc6c9ebf0a000cefe709ec1ab9b1358956a20 | |
| parent | c2358258c2ed3e964138eb7b66dbef5d6ef232ae (diff) | |
| parent | be06032eb00b6b9315049bc5585e1f51e29c9179 (diff) | |
| download | u-boot-133276f14acfbad4268acd19a70d3cda0a60b5e3.zip u-boot-133276f14acfbad4268acd19a70d3cda0a60b5e3.tar.gz u-boot-133276f14acfbad4268acd19a70d3cda0a60b5e3.tar.bz2 | |
Merge branch '2020-02-25-master-imports'
- Assorted fixes
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | arch/arm/lib/gic-v3-its.c | 1 | ||||
| -rw-r--r-- | configs/meerkat96_defconfig | 2 | ||||
| -rw-r--r-- | tools/image-host.c | 1 | ||||
| -rwxr-xr-x | tools/moveconfig.py | 6 |
5 files changed, 7 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 82e4159..1842569 100644 --- 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 e19ab01..6ee22d2 100644 --- 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 45f1211..894ddc6 100644 --- 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 9483561..76a361b 100644 --- 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 36160a3..d8bf7fd 100755 --- 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): |