Since commit fde192511bdb ("kconfig: remove tristate choice support"), all choice blocks are now boolean. There is no longer a need to specify the choice type explicitly. All "bool" prompts in choice entries have been converted to "prompt". This commit removes support for the "bool" syntax in choice entries.
Unified · Split
| @@ -412,8 +412,8 @@ choices:: · 411 unmodified lines | |||
| 412 | <choice block> | 412 | <choice block> |
| 413 | "endchoice" | 413 | "endchoice" |
| 414 | 414 | ||
| 415 | This defines a choice group and accepts any of the above attributes as | 415 | This defines a choice group and accepts "prompt", "default", "depends on", and |
| 416 | options. | 416 | "help" attributes as options. |
| 417 | 417 | ||
| 418 | A choice only allows a single config entry to be selected. | 418 | A choice only allows a single config entry to be selected. |
| 419 | 419 | ||
| @@ -293,12 +293,6 @@ choice_option: T_PROMPT T_WORD_QUOTE if_expr T_EOL · 292 unmodified lines | |||
| 293 | printd(DEBUG_PARSE, "%s:%d:prompt\n", cur_filename, cur_lineno); | 293 | printd(DEBUG_PARSE, "%s:%d:prompt\n", cur_filename, cur_lineno); |
| 294 | }; | 294 | }; |
| 295 | 295 | ||
| 296 | choice_option: T_BOOL T_WORD_QUOTE if_expr T_EOL | ||
| 297 | { | ||
| 298 | menu_add_prompt(P_PROMPT, $2, $3); | ||
| 299 | printd(DEBUG_PARSE, "%s:%d:bool\n", cur_filename, cur_lineno); | ||
| 300 | }; | ||
| 301 | |||
| 302 | choice_option: T_DEFAULT nonconst_symbol if_expr T_EOL | 296 | choice_option: T_DEFAULT nonconst_symbol if_expr T_EOL |
| 303 | { | 297 | { |
| 304 | menu_add_symbol(P_DEFAULT, $2, $3); | 298 | menu_add_symbol(P_DEFAULT, $2, $3); |