aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/kconfig/zconf.gperf1
-rw-r--r--scripts/kconfig/zconf.hash.c_shipped38
2 files changed, 18 insertions, 21 deletions
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
index 4051639c0900..25ef5d01c0af 100644
--- a/scripts/kconfig/zconf.gperf
+++ b/scripts/kconfig/zconf.gperf
@@ -35,7 +35,6 @@ int, T_TYPE, TF_COMMAND, S_INT
35hex, T_TYPE, TF_COMMAND, S_HEX 35hex, T_TYPE, TF_COMMAND, S_HEX
36string, T_TYPE, TF_COMMAND, S_STRING 36string, T_TYPE, TF_COMMAND, S_STRING
37select, T_SELECT, TF_COMMAND 37select, T_SELECT, TF_COMMAND
38enable, T_SELECT, TF_COMMAND
39range, T_RANGE, TF_COMMAND 38range, T_RANGE, TF_COMMAND
40option, T_OPTION, TF_COMMAND 39option, T_OPTION, TF_COMMAND
41on, T_ON, TF_PARAM 40on, T_ON, TF_PARAM
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
index c9d26bc1a214..5c73d51339d8 100644
--- a/scripts/kconfig/zconf.hash.c_shipped
+++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -1,4 +1,4 @@
1/* ANSI-C code produced by gperf version 3.0.2 */ 1/* ANSI-C code produced by gperf version 3.0.3 */
2/* Command-line: gperf */ 2/* Command-line: gperf */
3/* Computed positions: -k'1,3' */ 3/* Computed positions: -k'1,3' */
4 4
@@ -53,10 +53,10 @@ kconf_id_hash (register const char *str, register unsigned int len)
53 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 53 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
54 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 54 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
55 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 55 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
56 49, 49, 49, 49, 49, 49, 49, 35, 35, 5, 56 49, 49, 49, 49, 49, 49, 49, 49, 11, 5,
57 0, 0, 5, 49, 5, 20, 49, 49, 5, 20, 57 0, 0, 5, 49, 5, 20, 49, 49, 5, 20,
58 5, 0, 30, 49, 0, 15, 0, 10, 0, 49, 58 5, 0, 30, 49, 0, 15, 0, 10, 0, 49,
59 10, 49, 49, 49, 49, 49, 49, 49, 49, 49, 59 25, 49, 49, 49, 49, 49, 49, 49, 49, 49,
60 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 60 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
62 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 62 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
@@ -100,9 +100,10 @@ struct kconf_id_strings_t
100 char kconf_id_strings_str12[sizeof("default")]; 100 char kconf_id_strings_str12[sizeof("default")];
101 char kconf_id_strings_str13[sizeof("def_bool")]; 101 char kconf_id_strings_str13[sizeof("def_bool")];
102 char kconf_id_strings_str14[sizeof("help")]; 102 char kconf_id_strings_str14[sizeof("help")];
103 char kconf_id_strings_str15[sizeof("bool")];
103 char kconf_id_strings_str16[sizeof("config")]; 104 char kconf_id_strings_str16[sizeof("config")];
104 char kconf_id_strings_str17[sizeof("def_tristate")]; 105 char kconf_id_strings_str17[sizeof("def_tristate")];
105 char kconf_id_strings_str18[sizeof("hex")]; 106 char kconf_id_strings_str18[sizeof("boolean")];
106 char kconf_id_strings_str19[sizeof("defconfig_list")]; 107 char kconf_id_strings_str19[sizeof("defconfig_list")];
107 char kconf_id_strings_str21[sizeof("string")]; 108 char kconf_id_strings_str21[sizeof("string")];
108 char kconf_id_strings_str22[sizeof("if")]; 109 char kconf_id_strings_str22[sizeof("if")];
@@ -113,12 +114,10 @@ struct kconf_id_strings_t
113 char kconf_id_strings_str29[sizeof("menu")]; 114 char kconf_id_strings_str29[sizeof("menu")];
114 char kconf_id_strings_str31[sizeof("source")]; 115 char kconf_id_strings_str31[sizeof("source")];
115 char kconf_id_strings_str32[sizeof("comment")]; 116 char kconf_id_strings_str32[sizeof("comment")];
117 char kconf_id_strings_str33[sizeof("hex")];
116 char kconf_id_strings_str35[sizeof("menuconfig")]; 118 char kconf_id_strings_str35[sizeof("menuconfig")];
117 char kconf_id_strings_str36[sizeof("prompt")]; 119 char kconf_id_strings_str36[sizeof("prompt")];
118 char kconf_id_strings_str37[sizeof("depends")]; 120 char kconf_id_strings_str37[sizeof("depends")];
119 char kconf_id_strings_str39[sizeof("bool")];
120 char kconf_id_strings_str41[sizeof("enable")];
121 char kconf_id_strings_str42[sizeof("boolean")];
122 char kconf_id_strings_str48[sizeof("mainmenu")]; 121 char kconf_id_strings_str48[sizeof("mainmenu")];
123 }; 122 };
124static struct kconf_id_strings_t kconf_id_strings_contents = 123static struct kconf_id_strings_t kconf_id_strings_contents =
@@ -135,9 +134,10 @@ static struct kconf_id_strings_t kconf_id_strings_contents =
135 "default", 134 "default",
136 "def_bool", 135 "def_bool",
137 "help", 136 "help",
137 "bool",
138 "config", 138 "config",
139 "def_tristate", 139 "def_tristate",
140 "hex", 140 "boolean",
141 "defconfig_list", 141 "defconfig_list",
142 "string", 142 "string",
143 "if", 143 "if",
@@ -148,24 +148,25 @@ static struct kconf_id_strings_t kconf_id_strings_contents =
148 "menu", 148 "menu",
149 "source", 149 "source",
150 "comment", 150 "comment",
151 "hex",
151 "menuconfig", 152 "menuconfig",
152 "prompt", 153 "prompt",
153 "depends", 154 "depends",
154 "bool",
155 "enable",
156 "boolean",
157 "mainmenu" 155 "mainmenu"
158 }; 156 };
159#define kconf_id_strings ((const char *) &kconf_id_strings_contents) 157#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
160#ifdef __GNUC__ 158#ifdef __GNUC__
161__inline 159__inline
160#ifdef __GNUC_STDC_INLINE__
161__attribute__ ((__gnu_inline__))
162#endif
162#endif 163#endif
163struct kconf_id * 164struct kconf_id *
164kconf_id_lookup (register const char *str, register unsigned int len) 165kconf_id_lookup (register const char *str, register unsigned int len)
165{ 166{
166 enum 167 enum
167 { 168 {
168 TOTAL_KEYWORDS = 32, 169 TOTAL_KEYWORDS = 31,
169 MIN_WORD_LENGTH = 2, 170 MIN_WORD_LENGTH = 2,
170 MAX_WORD_LENGTH = 14, 171 MAX_WORD_LENGTH = 14,
171 MIN_HASH_VALUE = 2, 172 MIN_HASH_VALUE = 2,
@@ -188,10 +189,10 @@ kconf_id_lookup (register const char *str, register unsigned int len)
188 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN}, 189 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN},
189 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, 190 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN},
190 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_HELP, TF_COMMAND}, 191 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_HELP, TF_COMMAND},
191 {-1}, 192 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str15, T_TYPE, TF_COMMAND, S_BOOLEAN},
192 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_CONFIG, TF_COMMAND}, 193 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_CONFIG, TF_COMMAND},
193 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE}, 194 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE},
194 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_HEX}, 195 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_BOOLEAN},
195 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19, T_OPT_DEFCONFIG_LIST,TF_OPTION}, 196 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19, T_OPT_DEFCONFIG_LIST,TF_OPTION},
196 {-1}, 197 {-1},
197 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_TYPE, TF_COMMAND, S_STRING}, 198 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_TYPE, TF_COMMAND, S_STRING},
@@ -205,16 +206,13 @@ kconf_id_lookup (register const char *str, register unsigned int len)
205 {-1}, 206 {-1},
206 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SOURCE, TF_COMMAND}, 207 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SOURCE, TF_COMMAND},
207 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND}, 208 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND},
208 {-1}, {-1}, 209 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_TYPE, TF_COMMAND, S_HEX},
210 {-1},
209 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND}, 211 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND},
210 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_PROMPT, TF_COMMAND}, 212 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_PROMPT, TF_COMMAND},
211 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_DEPENDS, TF_COMMAND}, 213 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_DEPENDS, TF_COMMAND},
214 {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
212 {-1}, 215 {-1},
213 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39, T_TYPE, TF_COMMAND, S_BOOLEAN},
214 {-1},
215 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_SELECT, TF_COMMAND},
216 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_TYPE, TF_COMMAND, S_BOOLEAN},
217 {-1}, {-1}, {-1}, {-1}, {-1},
218 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND} 216 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND}
219 }; 217 };
220 218