4 files changed, 8 insertions, 8 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index faa9a4701b6f..bde4529a4d4e 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -356,7 +356,7 @@ lex.%.c: %.l
         cp $@ $@_shipped
 
 %.hash.c: %.gperf
-        gperf < $< > $@
+        gperf -C < $< > $@
         cp $@ $@_shipped
 
 endif
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
index c9e690eb7545..f14ab41154b6 100644
--- a/scripts/kconfig/zconf.gperf
+++ b/scripts/kconfig/zconf.gperf
@@ -9,7 +9,7 @@
 
 struct kconf_id;
 
-static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
+static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
 
 %%
 mainmenu,       T_MAINMENU,     TF_COMMAND
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index b22f884f9022..98aad534a682 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -96,7 +96,7 @@ n	[A-Za-z0-9_]
 
 <COMMAND>{
         {n}+    {
-                struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+                const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
                 BEGIN(PARAM);
                 current_pos.file = current_file;
                 current_pos.lineno = current_file->lineno;
@@ -132,7 +132,7 @@ n	[A-Za-z0-9_]
         \n      BEGIN(INITIAL); current_file->lineno++; return T_EOL;
         ---     /* ignore */
         ({n}|[-/.])+    {
-                struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+                const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
                 if (id && id->flags & TF_PARAM) {
                         zconflval.id = id;
                         return id->token;
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 49fb4ab664c3..98c57167ef7e 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -25,7 +25,7 @@ extern int zconflex(void);
 static void zconfprint(const char *err, ...);
 static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
-static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 
@@ -45,7 +45,7 @@ static struct menu *current_menu, *current_entry;
         struct symbol *symbol;
         struct expr *expr;
         struct menu *menu;
-        struct kconf_id *id;
+        const struct kconf_id *id;
 }
 
 %token <id>T_MAINMENU
@@ -229,7 +229,7 @@ symbol_option_list:
           /* empty */
         | symbol_option_list T_WORD symbol_option_arg
 {
-        struct kconf_id *id = kconf_id_lookup($2, strlen($2));
+        const struct kconf_id *id = kconf_id_lookup($2, strlen($2));
         if (id && id->flags & TF_OPTION)
                 menu_add_option(id->token, $3);
         else
@@ -545,7 +545,7 @@ static const char *zconf_tokenname(int token)
         return "<token>";
 }
 
-static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken)
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
 {
         if (id->token != endtoken) {
                 zconf_error("unexpected '%s' within %s block",