diff options
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index c55c227af463..87f723804079 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
| @@ -140,7 +140,9 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) | |||
| 140 | sym->flags |= def_flags; | 140 | sym->flags |= def_flags; |
| 141 | break; | 141 | break; |
| 142 | } | 142 | } |
| 143 | conf_warning("symbol value '%s' invalid for %s", p, sym->name); | 143 | if (def != S_DEF_AUTO) |
| 144 | conf_warning("symbol value '%s' invalid for %s", | ||
| 145 | p, sym->name); | ||
| 144 | return 1; | 146 | return 1; |
| 145 | case S_OTHER: | 147 | case S_OTHER: |
| 146 | if (*p != '"') { | 148 | if (*p != '"') { |
| @@ -161,7 +163,8 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) | |||
| 161 | memmove(p2, p2 + 1, strlen(p2)); | 163 | memmove(p2, p2 + 1, strlen(p2)); |
| 162 | } | 164 | } |
| 163 | if (!p2) { | 165 | if (!p2) { |
| 164 | conf_warning("invalid string found"); | 166 | if (def != S_DEF_AUTO) |
| 167 | conf_warning("invalid string found"); | ||
| 165 | return 1; | 168 | return 1; |
| 166 | } | 169 | } |
| 167 | /* fall through */ | 170 | /* fall through */ |
| @@ -172,7 +175,9 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) | |||
| 172 | sym->def[def].val = strdup(p); | 175 | sym->def[def].val = strdup(p); |
| 173 | sym->flags |= def_flags; | 176 | sym->flags |= def_flags; |
| 174 | } else { | 177 | } else { |
| 175 | conf_warning("symbol value '%s' invalid for %s", p, sym->name); | 178 | if (def != S_DEF_AUTO) |
| 179 | conf_warning("symbol value '%s' invalid for %s", | ||
| 180 | p, sym->name); | ||
| 176 | return 1; | 181 | return 1; |
| 177 | } | 182 | } |
| 178 | break; | 183 | break; |
