diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/conf.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/confdata.c | 27 | ||||
-rw-r--r-- | scripts/kconfig/lkc_proto.h | 1 |
3 files changed, 0 insertions, 29 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index c6bee85c3962..a38787a881ea 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -591,7 +591,6 @@ int main(int ac, char **av) | |||
591 | conf_read_simple(name, S_DEF_USER); | 591 | conf_read_simple(name, S_DEF_USER); |
592 | else if (!stat("all.config", &tmpstat)) | 592 | else if (!stat("all.config", &tmpstat)) |
593 | conf_read_simple("all.config", S_DEF_USER); | 593 | conf_read_simple("all.config", S_DEF_USER); |
594 | conf_set_env_sym("K64BIT", "64BIT", S_DEF_USER); | ||
595 | break; | 594 | break; |
596 | default: | 595 | default: |
597 | break; | 596 | break; |
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index e4fa3f302541..e0f402f3b75d 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
@@ -145,33 +145,6 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) | |||
145 | return 0; | 145 | return 0; |
146 | } | 146 | } |
147 | 147 | ||
148 | /* Read an environment variable and assign the value to the symbol */ | ||
149 | int conf_set_env_sym(const char *env, const char *symname, int def) | ||
150 | { | ||
151 | struct symbol *sym; | ||
152 | char *p; | ||
153 | int def_flags; | ||
154 | |||
155 | p = getenv(env); | ||
156 | if (p) { | ||
157 | char warning[200]; | ||
158 | sprintf(warning, "Environment variable (%s = \"%s\")", env, p); | ||
159 | conf_filename = warning; | ||
160 | def_flags = SYMBOL_DEF << def; | ||
161 | if (def == S_DEF_USER) { | ||
162 | sym = sym_find(symname); | ||
163 | if (!sym) | ||
164 | return 1; | ||
165 | } else { | ||
166 | sym = sym_lookup(symname, 0); | ||
167 | if (sym->type == S_UNKNOWN) | ||
168 | sym->type = S_OTHER; | ||
169 | } | ||
170 | conf_set_sym_val(sym, def, def_flags, p); | ||
171 | } | ||
172 | return 0; | ||
173 | } | ||
174 | |||
175 | int conf_read_simple(const char *name, int def) | 148 | int conf_read_simple(const char *name, int def) |
176 | { | 149 | { |
177 | FILE *in = NULL; | 150 | FILE *in = NULL; |
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index dca294e90cc3..4d09f6ddefe3 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h | |||
@@ -1,7 +1,6 @@ | |||
1 | 1 | ||
2 | /* confdata.c */ | 2 | /* confdata.c */ |
3 | P(conf_parse,void,(const char *name)); | 3 | P(conf_parse,void,(const char *name)); |
4 | P(conf_set_env_sym,int,(const char *envname, const char *symname, int def)); | ||
5 | P(conf_read,int,(const char *name)); | 4 | P(conf_read,int,(const char *name)); |
6 | P(conf_read_simple,int,(const char *name, int)); | 5 | P(conf_read_simple,int,(const char *name, int)); |
7 | P(conf_write,int,(const char *name)); | 6 | P(conf_write,int,(const char *name)); |