Commit 605e9710 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kconfig updates from Michal Marek:
 - kconfig warns about junk characters in Kconfig files
 - merge_config.sh error handling
 - small cleanup

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  merge_config.sh: exit on missing input files
  kconfig: Regenerate shipped zconf.{hash,lex}.c files
  kconfig: warn of unhandled characters in Kconfig commands
  kconfig: Delete unnecessary checks before the function call "sym_calc_value"
parents dab3c3cc 78a6854e

scripts/kconfig/confdata.c

+2 −5
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ int conf_read_simple(const char *name, int def) 
			goto load;

		sym_add_change_count(1);

		if (!sym_defconfig_list) {

			if (modules_sym)

			sym_calc_value(modules_sym);

			return 1;

		}
@@ -404,8 +403,6 @@ setsym: 
	}

	free(line);

	fclose(in);



	if (modules_sym)

	sym_calc_value(modules_sym);

	return 0;

}

scripts/kconfig/merge_config.sh

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ cat $INITFILE > $TMP_FILE 
# Merge files, printing warnings on overridden values

for MERGE_FILE in $MERGE_LIST ; do

	echo "Merging $MERGE_FILE"

	if [ ! -r "$MERGE_FILE" ]; then

		echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2

		exit 1

	fi

	CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)



	for CFG in $CFG_LIST ; do

scripts/kconfig/symbol.c

+1 −2
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ void sym_clear_all_valid(void) 
	for_all_symbols(i, sym)

		sym->flags &= ~SYMBOL_VALID;

	sym_add_change_count(1);

	if (modules_sym)

	sym_calc_value(modules_sym);

}

scripts/kconfig/zconf.gperf

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ comment, T_COMMENT, TF_COMMAND 
config,		T_CONFIG,	TF_COMMAND

menuconfig,	T_MENUCONFIG,	TF_COMMAND

help,		T_HELP,		TF_COMMAND

---help---,	T_HELP,		TF_COMMAND

if,		T_IF,		TF_COMMAND|TF_PARAM

endif,		T_ENDIF,	TF_COMMAND

depends,	T_DEPENDS,	TF_COMMAND

scripts/kconfig/zconf.hash.c_shipped

+31 −27
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ kconf_id_hash (register const char *str, register unsigned int len) 
      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,

      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,

      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,

      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,

      73, 73, 73, 73, 73,  0, 73, 73, 73, 73,

      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,

      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,

      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
@@ -96,6 +96,7 @@ struct kconf_id_strings_t 
    char kconf_id_strings_str7[sizeof("default")];

    char kconf_id_strings_str8[sizeof("tristate")];

    char kconf_id_strings_str9[sizeof("endchoice")];

    char kconf_id_strings_str10[sizeof("---help---")];

    char kconf_id_strings_str12[sizeof("def_tristate")];

    char kconf_id_strings_str13[sizeof("def_bool")];

    char kconf_id_strings_str14[sizeof("defconfig_list")];
@@ -132,6 +133,7 @@ static const struct kconf_id_strings_t kconf_id_strings_contents = 
    "default",

    "tristate",

    "endchoice",

    "---help---",

    "def_tristate",

    "def_bool",

    "defconfig_list",
@@ -172,7 +174,7 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
{

  enum

    {

      TOTAL_KEYWORDS = 33,

      TOTAL_KEYWORDS = 34,

      MIN_WORD_LENGTH = 2,

      MAX_WORD_LENGTH = 14,

      MIN_HASH_VALUE = 2,
@@ -182,34 +184,36 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
  static const struct kconf_id wordlist[] =

    {

      {-1}, {-1},

#line 25 "scripts/kconfig/zconf.gperf"

#line 26 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,		T_IF,		TF_COMMAND|TF_PARAM},

#line 36 "scripts/kconfig/zconf.gperf"

#line 37 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3,		T_TYPE,		TF_COMMAND, S_INT},

      {-1},

#line 26 "scripts/kconfig/zconf.gperf"

#line 27 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,		T_ENDIF,	TF_COMMAND},

      {-1},

#line 29 "scripts/kconfig/zconf.gperf"

#line 30 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},

#line 31 "scripts/kconfig/zconf.gperf"

#line 32 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_TYPE,		TF_COMMAND, S_TRISTATE},

#line 20 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,	T_ENDCHOICE,	TF_COMMAND},

      {-1}, {-1},

#line 32 "scripts/kconfig/zconf.gperf"

#line 25 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,	T_HELP,		TF_COMMAND},

      {-1},

#line 33 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},

#line 35 "scripts/kconfig/zconf.gperf"

#line 36 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},

#line 45 "scripts/kconfig/zconf.gperf"

#line 46 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,	T_OPT_DEFCONFIG_LIST,TF_OPTION},

      {-1}, {-1},

#line 43 "scripts/kconfig/zconf.gperf"

#line 44 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,		T_ON,		TF_PARAM},

#line 28 "scripts/kconfig/zconf.gperf"

#line 29 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,	T_OPTIONAL,	TF_COMMAND},

      {-1}, {-1},

#line 42 "scripts/kconfig/zconf.gperf"

#line 43 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_OPTION,	TF_COMMAND},

#line 17 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,	T_ENDMENU,	TF_COMMAND},
@@ -219,51 +223,51 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
#line 23 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str25,	T_MENUCONFIG,	TF_COMMAND},

      {-1},

#line 44 "scripts/kconfig/zconf.gperf"

#line 45 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,	T_OPT_MODULES,	TF_OPTION},

#line 47 "scripts/kconfig/zconf.gperf"

#line 48 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,	T_OPT_ALLNOCONFIG_Y,TF_OPTION},

#line 16 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,		T_MENU,		TF_COMMAND},

      {-1},

#line 39 "scripts/kconfig/zconf.gperf"

#line 40 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_SELECT,	TF_COMMAND},

#line 21 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,	T_COMMENT,	TF_COMMAND},

#line 46 "scripts/kconfig/zconf.gperf"

#line 47 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,		T_OPT_ENV,	TF_OPTION},

      {-1},

#line 40 "scripts/kconfig/zconf.gperf"

#line 41 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,		T_RANGE,	TF_COMMAND},

#line 19 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36,		T_CHOICE,	TF_COMMAND},

      {-1}, {-1},

#line 33 "scripts/kconfig/zconf.gperf"

#line 34 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39,		T_TYPE,		TF_COMMAND, S_BOOLEAN},

      {-1},

#line 18 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_SOURCE,	TF_COMMAND},

#line 41 "scripts/kconfig/zconf.gperf"

#line 42 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,	T_VISIBLE,	TF_COMMAND},

#line 37 "scripts/kconfig/zconf.gperf"

#line 38 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43,		T_TYPE,		TF_COMMAND, S_HEX},

      {-1}, {-1},

#line 22 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,		T_CONFIG,	TF_COMMAND},

#line 34 "scripts/kconfig/zconf.gperf"

#line 35 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47,	T_TYPE,		TF_COMMAND, S_BOOLEAN},

      {-1}, {-1}, {-1},

#line 38 "scripts/kconfig/zconf.gperf"

#line 39 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51,		T_TYPE,		TF_COMMAND, S_STRING},

      {-1}, {-1},

#line 24 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str54,		T_HELP,		TF_COMMAND},

      {-1},

#line 30 "scripts/kconfig/zconf.gperf"

#line 31 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str56,		T_PROMPT,	TF_COMMAND},

      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},

      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},

#line 27 "scripts/kconfig/zconf.gperf"

#line 28 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str72,	T_DEPENDS,	TF_COMMAND}

    };
@@ -285,5 +289,5 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
    }

  return 0;

}

#line 48 "scripts/kconfig/zconf.gperf"

#line 49 "scripts/kconfig/zconf.gperf"

CRA Git | Maintained and supported by SUSTech CRA and CCSE