Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2021-05-17-assorted-fixes'

Browse source
This commit is contained in:
Tom Rini 2021-05-18 14:17:54 -04:00
commit 428bec7cf9
5 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -118,7 +118,7 @@ F: cmd/arm/
ARM ALTERA SOCFPGA ARM ALTERA SOCFPGA
M: Marek Vasut <marex@denx.de> M: Marek Vasut <marex@denx.de>
M: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> 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 S: Maintainted
T: git https://source.denx.de/u-boot/custodians/u-boot-socfpga.git T: git https://source.denx.de/u-boot/custodians/u-boot-socfpga.git
F: arch/arm/mach-socfpga/ F: arch/arm/mach-socfpga/

6
Makefile
View file

@ -408,7 +408,7 @@ AWK = awk
PERL = perl PERL = perl
PYTHON ?= python PYTHON ?= python
PYTHON2 = python2 PYTHON2 = python2
PYTHON3 = python3 PYTHON3 ?= python3
DTC ?= $(objtree)/scripts/dtc/dtc DTC ?= $(objtree)/scripts/dtc/dtc
CHECK = sparse 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' # Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include/generated spl tpl \ MRPROPER_DIRS += include/config include/generated spl tpl \
.tmp_objdiff doc/output .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 \ MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \
ctags etags tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ 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 # clean - Delete most, but leave enough to build external modules
# #

4
common/cli_hush.c
View file

@ -3325,7 +3325,7 @@ static void *xmalloc(size_t size)
void *p = NULL; void *p = NULL;
if (!(p = malloc(size))) { if (!(p = malloc(size))) {
printf("ERROR : memory not allocated\n"); printf("ERROR : xmalloc failed\n");
for(;;); for(;;);
} }
return p; return p;
@ -3336,7 +3336,7 @@ static void *xrealloc(void *ptr, size_t size)
void *p = NULL; void *p = NULL;
if (!(p = realloc(ptr, size))) { if (!(p = realloc(ptr, size))) {
printf("ERROR : memory not allocated\n"); printf("ERROR : xrealloc failed\n");
for(;;); for(;;);
} }
return p; return p;

2
doc/git-mailrc
View file

@ -29,7 +29,7 @@ alias jaehoon Jaehoon Chung <jh80.chung@samsung.com>
alias jagan Jagan Teki <jagan@amarulasolutions.com> alias jagan Jagan Teki <jagan@amarulasolutions.com>
alias jhersh Joe Hershberger <joe.hershberger@ni.com> alias jhersh Joe Hershberger <joe.hershberger@ni.com>
alias kevery Kever Yang <kever.yang@rock-chips.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 lokeshvutla Lokesh Vutla <lokeshvutla@ti.com>
alias lukma Lukasz Majewski <lukma@denx.de> alias lukma Lukasz Majewski <lukma@denx.de>
alias macpaul Macpaul Lin <macpaul@andestech.com> alias macpaul Macpaul Lin <macpaul@andestech.com>

5
drivers/firmware/psci.c
View file

@ -66,7 +66,7 @@ unsigned long __efi_runtime invoke_psci_fn
return res.a0; 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, return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES,
psci_func_id, 0, 0); psci_func_id, 0, 0);
@ -85,7 +85,8 @@ static bool psci_is_system_reset2_supported(void)
ver = psci_0_2_get_version(); ver = psci_0_2_get_version();
if (PSCI_VERSION_MAJOR(ver) >= 1) { 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) if (ret != PSCI_RET_NOT_SUPPORTED)
return true; return true;