From b4d14bc81ad580000277deae5d51e3e3ef09875f Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Wed, 17 Jun 2020 18:19:18 +0200 Subject: Convert CONFIG_ARMV7_PSCI_1_0 and CONFIG_ARMV7_PSCI_0_2 to Kconfig This converts the following to Kconfig: CONFIG_ARMV7_PSCI_1_0 CONFIG_ARMV7_PSCI_0_2 Signed-off-by: Patrick Delaunay --- scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e3bebe94c4c..da495f545b5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -44,7 +44,6 @@ CONFIG_ARMADA100 CONFIG_ARMADA100_FEC CONFIG_ARMADA168 CONFIG_ARMADA_39X -CONFIG_ARMV7_PSCI_1_0 CONFIG_ARMV7_SECURE_BASE CONFIG_ARMV7_SECURE_MAX_SIZE CONFIG_ARMV7_SECURE_RESERVE_SIZE -- cgit v1.3.1 From 02ff91e8c60f1f48bee8f4bd1c87ea0892cc5dae Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 25 Jun 2020 09:26:57 +0200 Subject: arm64: Remove CONFIG_SYS_FULL_VA macro All configurations have been removed in 2016 by commit 7985cdf74b28 ("arm64: Remove non-full-va map code"). Signed-off-by: Michal Simek --- include/configs/s32v234evb.h | 4 ---- scripts/config_whitelist.txt | 1 - 2 files changed, 5 deletions(-) (limited to 'scripts') diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index e207ca45fdb..11ae2c1c528 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -34,10 +34,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT -/* Config CACHE */ - -#define CONFIG_SYS_FULL_VA - /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index da495f545b5..1602b05f077 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2647,7 +2647,6 @@ CONFIG_SYS_FTSDMC021_CR2 CONFIG_SYS_FTSDMC021_TP1 CONFIG_SYS_FTSDMC021_TP2 CONFIG_SYS_FTSMC020_CONFIGS -CONFIG_SYS_FULL_VA CONFIG_SYS_GAFR0_L_VAL CONFIG_SYS_GAFR0_U_VAL CONFIG_SYS_GAFR1_L_VAL -- cgit v1.3.1 From 5c6a4d5a2779d7c2611319076d9aa4a23981855f Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Tue, 7 Jul 2020 10:40:26 +0200 Subject: remove include/config_defaults.h Since commit 4b0bcfa7c4ec (Kconfig: Migrate CONFIG_BOOTM_* options), the config_defaults.h file has been void of any actual content - and these days, "sane defaults for everyone" is achieved by appropriate default values in Kconfig. Remove it, and thus make every translation unit process one less header file. Signed-off-by: Rasmus Villemoes --- include/config_defaults.h | 12 ------------ include/configs/kc1.h | 6 ------ include/configs/sniper.h | 6 ------ scripts/Makefile.autoconf | 1 - 4 files changed, 25 deletions(-) delete mode 100644 include/config_defaults.h (limited to 'scripts') diff --git a/include/config_defaults.h b/include/config_defaults.h deleted file mode 100644 index d211a41ef29..00000000000 --- a/include/config_defaults.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * config_defaults.h - sane defaults for everyone - * - * Copyright (c) 2009 Analog Devices Inc. - * - * Licensed under the GPL-2 or later. - */ - -#ifndef _CONFIG_DEFAULTS_H_ -#define _CONFIG_DEFAULTS_H_ - -#endif diff --git a/include/configs/kc1.h b/include/configs/kc1.h index e3a219c46b8..3f71739f83b 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -149,10 +149,4 @@ "mmc read ${kernel_addr_r} ${boot_mmc_start} ${boot_mmc_size} && " \ "bootm ${kernel_addr_r};" -/* - * Defaults - */ - -#include - #endif diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 0e2fcc3e232..5ea8efabfc7 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -142,10 +142,4 @@ "mmc read ${kernel_addr_r} ${boot_mmc_start} ${boot_mmc_size} && " \ "bootm ${kernel_addr_r};" -/* - * Defaults - */ - -#include - #endif diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 00b8fb34aa7..0bfc1b2a629 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -104,7 +104,6 @@ define filechk_config_h | sed '/=/ {s/=/ /;q; } ; { s/$$/ 1/; }'; \ done; \ echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ - echo \#include \; \ echo \#include \; \ echo \#include \; \ echo \#include \; \ -- cgit v1.3.1 From 76ae74d348a05c8c9deb718368a69ba05afd9784 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 8 Jul 2020 15:45:56 -0600 Subject: fixdep: fix CONFIG_IS_ENABLED etc. handling When fixdep detects CONFIG_IS_ENABLED and other similar macros, it must parse the macro parameter to determine which actual CONFIG_ option is being referenced. This involves moving a pointer forward through the entire CONFIG_ option "word". Currently, the code uses variable q to walk through the word, but doesn't actually initialize it to point at the parameter before doing so. Consequently, the walking process immediately fails since it sees the macro invocatoins's ( rather than the expected alpha-numeric characters in the macro parameter. Fix this by adding the missing initialization. Fixes: 67f2ee86ccbe ("kbuild: fixdep: Resync this with v4.17") Fixes: 7012865e961c ("gpio: fix test.py for gpio label lookup") Signed-off-by: Stephen Warren Reviewed-by: Simon Glass --- scripts/basic/fixdep.c | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 24be244d5e6..958668df554 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -266,6 +266,7 @@ static void parse_config_file(const char *p) (q - p == 9 && !memcmp(p, "IS_MODULE(", 10)) || (q - p == 3 && !memcmp(p, "VAL(", 4))) { p = q + 1; + q = p; while (isalnum(*q) || *q == '_') q++; r = q; -- cgit v1.3.1