diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-18 14:17:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-18 14:17:54 -0400 |
| commit | 428bec7cf956c3558bbdfda4d2ba23beb73a68ba (patch) | |
| tree | 290ddd25fb619aaf112e89e32a4cca181e922e3e | |
| parent | 7a1638c263508f7ff67fc82af5ea8072dcb783e2 (diff) | |
| parent | af02975eb9e2b1a963b0fb03869ccf1bbf30caa7 (diff) | |
| download | u-boot-WIP/18May2021.zip u-boot-WIP/18May2021.tar.gz u-boot-WIP/18May2021.tar.bz2 | |
Merge branch '2021-05-17-assorted-fixes'WIP/18May2021
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | common/cli_hush.c | 4 | ||||
| -rw-r--r-- | doc/git-mailrc | 2 | ||||
| -rw-r--r-- | drivers/firmware/psci.c | 5 |
5 files changed, 11 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f5c73db..9f0c9f9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -118,7 +118,7 @@ F: cmd/arm/ 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/ @@ -408,7 +408,7 @@ AWK = awk PERL = perl PYTHON ?= python PYTHON2 = python2 -PYTHON3 = python3 +PYTHON3 ?= python3 DTC ?= $(objtree)/scripts/dtc/dtc CHECK = sparse @@ -2010,9 +2010,11 @@ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \ # 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 @@ static void *xmalloc(size_t size) 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 @@ static void *xrealloc(void *ptr, size_t size) 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 jaehoon Jaehoon Chung <jh80.chung@samsung.com> 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 @@ unsigned long __efi_runtime invoke_psci_fn 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 @@ static bool psci_is_system_reset2_supported(void) 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; |