diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.autoconf | 1 | ||||
| -rw-r--r-- | scripts/basic/fixdep.c | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 2 |
3 files changed, 1 insertions, 3 deletions
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 \<config_defaults.h\>; \ echo \#include \<config_uncmd_spl.h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<asm/config.h\>; \ 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; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e3bebe94c4c..1602b05f077 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 @@ -2648,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 |