Merge branch '2021-05-17-assorted-fixes'
diff --git a/MAINTAINERS b/MAINTAINERS
index f5c73db..9f0c9f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -118,7 +118,7 @@
ARM ALTERA SOCFPGA
M: Marek Vasut <marex@denx.de>
M: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
-M: Ley Foon Tan <ley.foon.tan@intel.com>
+M: Ley Foon Tan <lftan.linux@gmail.com>
S: Maintainted
T: git https://source.denx.de/u-boot/custodians/u-boot-socfpga.git
F: arch/arm/mach-socfpga/
diff --git a/Makefile b/Makefile
index 559594f..3a6cd15 100644
--- a/Makefile
+++ b/Makefile
@@ -408,7 +408,7 @@
PERL = perl
PYTHON ?= python
PYTHON2 = python2
-PYTHON3 = python3
+PYTHON3 ?= python3
DTC ?= $(objtree)/scripts/dtc/dtc
CHECK = sparse
@@ -2010,9 +2010,11 @@
# Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include/generated spl tpl \
.tmp_objdiff doc/output
+
+# Remove include/asm symlink created by U-Boot before v2014.01
MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \
ctags etags tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
- drivers/video/fonts/*.S
+ drivers/video/fonts/*.S include/asm
# clean - Delete most, but leave enough to build external modules
#
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 6cff3b1..1467ff8 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -3325,7 +3325,7 @@
void *p = NULL;
if (!(p = malloc(size))) {
- printf("ERROR : memory not allocated\n");
+ printf("ERROR : xmalloc failed\n");
for(;;);
}
return p;
@@ -3336,7 +3336,7 @@
void *p = NULL;
if (!(p = realloc(ptr, size))) {
- printf("ERROR : memory not allocated\n");
+ printf("ERROR : xrealloc failed\n");
for(;;);
}
return p;
diff --git a/doc/git-mailrc b/doc/git-mailrc
index f520ff8..34f936f 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -29,7 +29,7 @@
alias jagan Jagan Teki <jagan@amarulasolutions.com>
alias jhersh Joe Hershberger <joe.hershberger@ni.com>
alias kevery Kever Yang <kever.yang@rock-chips.com>
-alias leyfoon Ley Foon Tan <ley.foon.tan@intel.com>
+alias leyfoon Ley Foon Tan <lftan.linux@gmail.com>
alias lokeshvutla Lokesh Vutla <lokeshvutla@ti.com>
alias lukma Lukasz Majewski <lukma@denx.de>
alias macpaul Macpaul Lin <macpaul@andestech.com>
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index be57552..6755e74 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -66,7 +66,7 @@
return res.a0;
}
-static int psci_features(u32 psci_func_id)
+static int request_psci_features(u32 psci_func_id)
{
return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES,
psci_func_id, 0, 0);
@@ -85,7 +85,8 @@
ver = psci_0_2_get_version();
if (PSCI_VERSION_MAJOR(ver) >= 1) {
- ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2));
+ ret = request_psci_features(PSCI_FN_NATIVE(1_1,
+ SYSTEM_RESET2));
if (ret != PSCI_RET_NOT_SUPPORTED)
return true;