From f68ed0bcb8a7f86510fe932c4519366776b1671d Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Sat, 1 May 2021 22:12:21 +0200 Subject: [PATCH 1/5] Makefile: allow to override python3 Python3 taken from the PATH causes build issues when pylibfdt bindings are generated with Yocto SDK. Python3 provided as a part of SDK is not compatible with host Python3, therefore binding build breaks with following errors: scripts/dtc/pylibfdt/libfdt_wrap.c:154:11: fatal error: Python.h: No such file or directory 154 | # include | ^~~~~~~~~~ Do not enforce the python3 from the PATH and make it conditionally-assigned so it can be overridden from outside of build system. Keep the default assignment to point to version that is taken from the PATH. Similar fix has been introduced in b48bfc74ee ("tools: allow to override python"), where conditional assignment is used for python executable to address similar build errors. Signed-off-by: Andrey Zhizhikin Cc: Simon Glass Fixes: e91610da7c ("kconfig: re-sync with Linux 4.17-rc4") Reviewed-by: Simon Glass --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 559594fe1d8..4dc33459894 100644 --- a/Makefile +++ b/Makefile @@ -408,7 +408,7 @@ AWK = awk PERL = perl PYTHON ?= python PYTHON2 = python2 -PYTHON3 = python3 +PYTHON3 ?= python3 DTC ?= $(objtree)/scripts/dtc/dtc CHECK = sparse From 6c353b34cfd86797be25de8908695132646ef321 Mon Sep 17 00:00:00 2001 From: "peng.wang@smartm.com" Date: Tue, 4 May 2021 01:45:59 -0700 Subject: [PATCH 2/5] cli: slighly more clear error messages This patch tries to distinguish two error messages. Signed-off-by: peng.wang@smartm.com --- common/cli_hush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cli_hush.c b/common/cli_hush.c index 6cff3b11850..1467ff81b35 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; From eefa9d7f089f5da5646b40bd713e8c42b27c2e43 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Thu, 6 May 2021 17:34:27 +0300 Subject: [PATCH 3/5] psci: rename psci_features function s/psci_features/request_psci_features/g for the case when both ARCH_SUPPORT_PSCI=y and ARM_PSCI_FW=y, that leads to these compilation issues: drivers/firmware/psci.c:69:12: error: conflicting types for 'psci_features' 69 | static int psci_features(u32 psci_func_id) | ^~~~~~~~~~~~~ In file included from drivers/firmware/psci.c:23: ./arch/arm/include/asm/system.h:548:5: note: previous declaration of 'psci_features' was here 548 | s32 psci_features(u32 function_id, u32 psci_fid); | ^~~~~~~~~~~~~ Tested-by: Alexandru Gagniuc Reported-by: Alexandru Gagniuc Fixes: b7135b034f ("psci: add features/reset2 support") Signed-off-by: Igor Opaniuk --- drivers/firmware/psci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index be57552aba0..6755e74e3f8 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; From a7d03d5342bc0f5989cebf138fd566f97f555089 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 6 May 2021 19:32:23 -0600 Subject: [PATCH 4/5] Makefile: Handle building in a very old build directory Versions of U-Boot before 2014.01 created a symlink from include/asm to the architecture-specific header directory. If an ARM board is build with that old version, then sandbox is built on a more recent version (both with in-tree builds), the include/asm symlink confuses the build system. It picks up the ARM headers when it should be using the sandbox ones. Since 2014 U-Boot has only created a symlink inside the include/asm/ directory and only for out-of-tree builds. So for in-tree builds it does not expect to see an include/asm symlink. It is not removed by 'make mrproper'. It does show up with 'git status' but is easy enough to miss. Add include/asm to the files to remove with 'make mkproper'. For recent U-Boot builds this has no effect, since include/asm is a directory, not a file. If the include/asm symlink is there, it will be removed. Reported-by: Marek Szyprowski Signed-off-by: Simon Glass --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4dc33459894..3a6cd15460e 100644 --- a/Makefile +++ b/Makefile @@ -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 # From af02975eb9e2b1a963b0fb03869ccf1bbf30caa7 Mon Sep 17 00:00:00 2001 From: Ley Foon Tan Date: Wed, 12 May 2021 18:31:57 +0800 Subject: [PATCH 5/5] MAINTAINERS, git-mailrc: socfpga: Update email address for Ley Foon My mail address doesn't work any longer, change to gmail. Signed-off-by: Ley Foon Tan --- MAINTAINERS | 2 +- doc/git-mailrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index f5c73db3438..9f0c9f9f735 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -118,7 +118,7 @@ F: cmd/arm/ ARM ALTERA SOCFPGA M: Marek Vasut M: Simon Goldschmidt -M: Ley Foon Tan +M: Ley Foon Tan S: Maintainted T: git https://source.denx.de/u-boot/custodians/u-boot-socfpga.git F: arch/arm/mach-socfpga/ diff --git a/doc/git-mailrc b/doc/git-mailrc index f520ff89b39..34f936f4d83 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -29,7 +29,7 @@ alias jaehoon Jaehoon Chung alias jagan Jagan Teki alias jhersh Joe Hershberger alias kevery Kever Yang -alias leyfoon Ley Foon Tan +alias leyfoon Ley Foon Tan alias lokeshvutla Lokesh Vutla alias lukma Lukasz Majewski alias macpaul Macpaul Lin