diff options
Diffstat (limited to 'scripts/kconfig/confdata.c')
-rw-r--r-- | scripts/kconfig/confdata.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 02f670cc6bb9..4bba6202b79e 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
@@ -69,15 +69,13 @@ char *conf_get_default_confname(void) | |||
69 | return name; | 69 | return name; |
70 | } | 70 | } |
71 | 71 | ||
72 | int conf_read(const char *name) | 72 | int conf_read_simple(const char *name) |
73 | { | 73 | { |
74 | FILE *in = NULL; | 74 | FILE *in = NULL; |
75 | char line[1024]; | 75 | char line[1024]; |
76 | char *p, *p2; | 76 | char *p, *p2; |
77 | int lineno = 0; | 77 | int lineno = 0; |
78 | struct symbol *sym; | 78 | struct symbol *sym; |
79 | struct property *prop; | ||
80 | struct expr *e; | ||
81 | int i; | 79 | int i; |
82 | 80 | ||
83 | if (name) { | 81 | if (name) { |
@@ -232,6 +230,19 @@ int conf_read(const char *name) | |||
232 | 230 | ||
233 | if (modules_sym) | 231 | if (modules_sym) |
234 | sym_calc_value(modules_sym); | 232 | sym_calc_value(modules_sym); |
233 | return 0; | ||
234 | } | ||
235 | |||
236 | int conf_read(const char *name) | ||
237 | { | ||
238 | struct symbol *sym; | ||
239 | struct property *prop; | ||
240 | struct expr *e; | ||
241 | int i; | ||
242 | |||
243 | if (conf_read_simple(name)) | ||
244 | return 1; | ||
245 | |||
235 | for_all_symbols(i, sym) { | 246 | for_all_symbols(i, sym) { |
236 | sym_calc_value(sym); | 247 | sym_calc_value(sym); |
237 | if (sym_has_value(sym) && !sym_is_choice_value(sym)) { | 248 | if (sym_has_value(sym) && !sym_is_choice_value(sym)) { |