From a3ca99c26084f25aee001c40189d999815c99d8e Mon Sep 17 00:00:00 2001 From: Philippe Reynes Date: Tue, 18 Feb 2020 17:23:20 +0100 Subject: [PATCH 1/6] tools: image-host.c: remove uboot_aes.h The include uboot_aes.h is not useful and it breaks the compilation on android, so we remove it. Signed-off-by: Philippe Reynes Reported-by: Praneeth Bajjuri --- tools/image-host.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/image-host.c b/tools/image-host.c index 9483561bfa..76a361b9d6 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -12,7 +12,6 @@ #include #include #include -#include /** * fit_set_hash_value - set hash value in requested has node From f381a26cb5c3e91a062a0b3bf76aa03c5fa468fc Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Fri, 14 Feb 2020 11:00:52 +0530 Subject: [PATCH 2/6] arch: arm: Fix SZ_64K undeclared compilation error Macro SZ_64K is undeclared. Include sizes.h to fix the compilation error. Signed-off-by: Wasim Khan Reviewed-by: Tom Rini --- arch/arm/lib/gic-v3-its.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c index e19ab01621..6ee22d2944 100644 --- a/arch/arm/lib/gic-v3-its.c +++ b/arch/arm/lib/gic-v3-its.c @@ -6,6 +6,7 @@ #include #include #include +#include static u32 lpi_id_bits; From 080cc0b1b33465db68a9863beeb827514093f893 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 22 Feb 2020 07:45:50 +0100 Subject: [PATCH 3/6] MAINTAINERS: set maintainer for doc/api/efi.rst doc/api/efi.rst belongs to the UEFI sub-system documentation. Signed-off-by: Heinrich Schuchardt --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 82e4159bec..1842569f24 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -563,6 +563,7 @@ M: Heinrich Schuchardt R: Alexander Graf 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 From b3192f48c19c15d37ba69722b2846de4b73b27cd Mon Sep 17 00:00:00 2001 From: Markus Klotzbuecher Date: Wed, 12 Feb 2020 20:46:44 +0100 Subject: [PATCH 4/6] moveconfig: replace unsafe eval with asteval Commit b237d358b425 ("moveconfig: expand simple expressions") added support for expanding expressions in configs, but used the unsafe python built-in "eval". This patch fixes this by replacing eval with the asteval module. Signed-off-by: Markus Klotzbuecher Cc: Heinrich Schuchardt Cc: Heiko Schocher Cc: Tom Rini Cc: Simon Glass Cc: Joe Hershberger Cc: Masahiro Yamada Reviewed-by: Heinrich Schuchardt --- tools/moveconfig.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index 36160a3977..df20ec66af 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: From 4f5c5e99bb5cd6b8aacee3a4900edbc406dbb813 Mon Sep 17 00:00:00 2001 From: Markus Klotzbuecher Date: Wed, 12 Feb 2020 20:46:45 +0100 Subject: [PATCH 5/6] moveconfig: convert ps.stderr to string Printing the error message in verbose mode fails, since python3 doesn't implicitely convert bytes to strings. Signed-off-by: Markus Klotzbuecher Cc: Simon Glass Cc: Tom Rini Cc: Masahiro Yamada Reviewed-by: Simon Glass --- tools/moveconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index df20ec66af..d8bf7fd071 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -1217,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): From be06032eb00b6b9315049bc5585e1f51e29c9179 Mon Sep 17 00:00:00 2001 From: Carl Gelfand Date: Wed, 22 Jan 2020 16:03:02 -0500 Subject: [PATCH 6/6] board: novtech: meerkat96: use correct mmc driver When the board was originally submitted, it was attempting to use the ESDHC driver. The board uses the USDHC driver. Signed-off-by: Carl Gelfand Cc: Shawn Guo (maintainer:MEERKAT96 BOARD) Acked-by: Shawn Guo --- configs/meerkat96_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/meerkat96_defconfig b/configs/meerkat96_defconfig index 45f12115ba..894ddc6c79 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