support/kconfig: bump to kconfig from linux-3.12 (b48e35a2) · Commits · Dom Sekotill / buildroot

support/kconfig/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,9 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \

		HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))

		HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses
		HOSTLOADLIBES_nconf = $(shell \
		pkg-config --libs menu panel ncurses 2>/dev/null \
		\|\| echo "-lmenu -lpanel -lncurses" )
		$(obj)/qconf.o: $(obj)/.tmp_qtcheck

		ifeq ($(qconf-target),1)

support/kconfig/conf.c

+14 −2

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <getopt.h>
		#include <sys/stat.h>
		#include <sys/time.h>
		#include <errno.h>

		#include "lkc.h"

		@@ -514,14 +515,24 @@ int main(int ac, char **av)
		{
		struct timeval now;
		unsigned int seed;
		char *seed_env;

		/*
		* Use microseconds derived seed,
		* compensate for systems where it may be zero
		*/
		gettimeofday(&now, NULL);

		seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));

		seed_env = getenv("KCONFIG_SEED");
		if( seed_env && *seed_env ) {
		char *endp;
		int tmp = (int)strtol(seed_env, &endp, 0);
		if (*endp == '\0') {
		seed = tmp;
		}
		}
		fprintf( stderr, "KCONFIG_SEED=0x%X\n", seed );
		srand(seed);
		break;
		}
		@@ -642,7 +653,8 @@ int main(int ac, char **av)
		conf_set_all_new_symbols(def_default);
		break;
		case randconfig:
		conf_set_all_new_symbols(def_random);
		/* Really nothing to do in this loop */
		while (conf_set_all_new_symbols(def_random)) ;
		break;
		case defconfig:
		conf_set_all_new_symbols(def_default);

support/kconfig/confdata.c

+85 −26

Original line number	Diff line number	Diff line
		@@ -139,7 +139,9 @@ static int conf_set_sym_val(struct symbol sym, int def, int def_flags, char p)
		sym->flags \|= def_flags;
		break;
		}
		conf_warning("symbol value '%s' invalid for %s", p, sym->name);
		if (def != S_DEF_AUTO)
		conf_warning("symbol value '%s' invalid for %s",
		p, sym->name);
		return 1;
		case S_OTHER:
		if (*p != '"') {
		@@ -160,6 +162,7 @@ static int conf_set_sym_val(struct symbol sym, int def, int def_flags, char p)
		memmove(p2, p2 + 1, strlen(p2));
		}
		if (!p2) {
		if (def != S_DEF_AUTO)
		conf_warning("invalid string found");
		return 1;
		}
		@@ -171,7 +174,9 @@ static int conf_set_sym_val(struct symbol sym, int def, int def_flags, char p)
		sym->def[def].val = strdup(p);
		sym->flags \|= def_flags;
		} else {
		conf_warning("symbol value '%s' invalid for %s", p, sym->name);
		if (def != S_DEF_AUTO)
		conf_warning("symbol value '%s' invalid for %s",
		p, sym->name);
		return 1;
		}
		break;
		@@ -1073,7 +1078,7 @@ void conf_set_changed_callback(void (*fn)(void))
		conf_changed_callback = fn;
		}

		static void randomize_choice_values(struct symbol *csym)
		static bool randomize_choice_values(struct symbol *csym)
		{
		struct property *prop;
		struct symbol *sym;
		@@ -1086,7 +1091,7 @@ static void randomize_choice_values(struct symbol *csym)
		* In both cases stop.
		*/
		if (csym->curr.tri != yes)
		return;
		return false;

		prop = sym_get_choice_prop(csym);

		@@ -1110,13 +1115,18 @@ static void randomize_choice_values(struct symbol *csym)
		else {
		sym->def[S_DEF_USER].tri = no;
		}
		sym->flags \|= SYMBOL_DEF_USER;
		/* clear VALID to get value calculated */
		sym->flags &= ~SYMBOL_VALID;
		}
		csym->flags \|= SYMBOL_DEF_USER;
		/* clear VALID to get value calculated */
		csym->flags &= ~(SYMBOL_VALID);

		return true;
		}

		static void set_all_choice_values(struct symbol *csym)
		void set_all_choice_values(struct symbol *csym)
		{
		struct property *prop;
		struct symbol *sym;
		@@ -1133,29 +1143,66 @@ static void set_all_choice_values(struct symbol *csym)
		}
		csym->flags \|= SYMBOL_DEF_USER;
		/* clear VALID to get value calculated */
		csym->flags &= ~(SYMBOL_VALID);
		csym->flags &= ~(SYMBOL_VALID \| SYMBOL_NEED_SET_CHOICE_VALUES);
		}

		void conf_set_all_new_symbols(enum conf_def_mode mode)
		bool conf_set_all_new_symbols(enum conf_def_mode mode)
		{
		struct symbol sym, csym;
		int i, cnt, prob = 50;
		int i, cnt, pby, pty, ptm; /* pby: probability of boolean = y
		* pty: probability of tristate = y
		* ptm: probability of tristate = m
		*/

		pby = 50; pty = ptm = 33; /* can't go as the default in switch-case
		* below, otherwise gcc whines about
		* -Wmaybe-uninitialized */
		if (mode == def_random) {
		char endp, env = getenv("KCONFIG_PROBABILITY");
		if (env && *env) {
		int tmp = (int)strtol(env, &endp, 10);
		if (*endp == '\0' && tmp >= 0 && tmp <= 100)
		prob = tmp;
		int n, p[3];
		char *env = getenv("KCONFIG_PROBABILITY");
		n = 0;
		while( env && *env ) {
		char *endp;
		int tmp = strtol( env, &endp, 10 );
		if( tmp >= 0 && tmp <= 100 ) {
		p[n++] = tmp;
		} else {
		errno = ERANGE;
		perror( "KCONFIG_PROBABILITY" );
		exit( 1 );
		}
		env = (*endp == ':') ? endp+1 : endp;
		if( n >=3 ) {
		break;
		}
		}
		switch( n ) {
		case 1:
		pby = p[0]; ptm = pby/2; pty = pby-ptm;
		break;
		case 2:
		pty = p[0]; ptm = p[1]; pby = pty + ptm;
		break;
		case 3:
		pby = p[0]; pty = p[1]; ptm = p[2];
		break;
		}

		if( pty+ptm > 100 ) {
		errno = ERANGE;
		perror( "KCONFIG_PROBABILITY" );
		exit( 1 );
		}
		}
		bool has_changed = false;

		for_all_symbols(i, sym) {
		if (sym_has_value(sym))
		if (sym_has_value(sym) \|\| (sym->flags & SYMBOL_VALID))
		continue;
		switch (sym_get_type(sym)) {
		case S_BOOLEAN:
		case S_TRISTATE:
		has_changed = true;
		switch (mode) {
		case def_yes:
		sym->def[S_DEF_USER].tri = yes;
		@@ -1167,14 +1214,14 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
		sym->def[S_DEF_USER].tri = no;
		break;
		case def_random:
		cnt = (rand() % 100) - (100 - prob);
		if (cnt < 0)
		sym->def[S_DEF_USER].tri = no;
		else
		if ((sym_get_type(sym) == S_TRISTATE)
		&& (cnt > prob/2))
		cnt = rand() % 100;
		if (sym->type == S_TRISTATE) {
		if (cnt < pty)
		sym->def[S_DEF_USER].tri = yes;
		else if (cnt < (pty+ptm))
		sym->def[S_DEF_USER].tri = mod;
		else
		} else if (cnt < pby)
		sym->def[S_DEF_USER].tri = yes;
		break;
		default:
		@@ -1200,14 +1247,26 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
		* selected in a choice block and we set it to yes,
		* and the rest to no.
		*/
		if (mode != def_random) {
		for_all_symbols(i, csym) {
		if ((sym_is_choice(csym) && !sym_has_value(csym)) \|\|
		sym_is_choice_value(csym))
		csym->flags \|= SYMBOL_NEED_SET_CHOICE_VALUES;
		}
		}

		for_all_symbols(i, csym) {
		if (sym_has_value(csym) \|\| !sym_is_choice(csym))
		continue;

		sym_calc_value(csym);
		if (mode == def_random)
		randomize_choice_values(csym);
		else
		has_changed = randomize_choice_values(csym);
		else {
		set_all_choice_values(csym);
		has_changed = true;
		}
		}

		return has_changed;
		}

support/kconfig/expr.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,9 @@ struct symbol {
		#define SYMBOL_DEF3 0x40000 /* symbol.def[S_DEF_3] is valid */
		#define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */

		/* choice values need to be set before calculating this symbol value */
		#define SYMBOL_NEED_SET_CHOICE_VALUES 0x100000

		#define SYMBOL_MAXLENGTH 256
		#define SYMBOL_HASHSIZE 9973

support/kconfig/list.h

+40 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,19 @@ struct list_head {
		&pos->member != (head); \
		pos = list_entry(pos->member.next, typeof(*pos), member))

		/**
		* list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
		* @pos: the type * to use as a loop cursor.
		* @n: another type * to use as temporary storage
		* @head: the head for your list.
		* @member: the name of the list_struct within the struct.
		*/
		#define list_for_each_entry_safe(pos, n, head, member) \
		for (pos = list_entry((head)->next, typeof(*pos), member), \
		n = list_entry(pos->member.next, typeof(*pos), member); \
		&pos->member != (head); \
		pos = n, n = list_entry(n->member.next, typeof(*n), member))

		/**
		* list_empty - tests whether a list is empty
		* @head: the list to test.
		@@ -88,4 +101,31 @@ static inline void list_add_tail(struct list_head _new, struct list_head head)
		__list_add(_new, head->prev, head);
		}

		/*
		* Delete a list entry by making the prev/next entries
		* point to each other.
		*
		* This is only for internal list manipulation where we know
		* the prev/next entries already!
		*/
		static inline void __list_del(struct list_head prev, struct list_head next)
		{
		next->prev = prev;
		prev->next = next;
		}

		#define LIST_POISON1 ((void *) 0x00100100)
		#define LIST_POISON2 ((void *) 0x00200200)
		/**
		* list_del - deletes entry from list.
		* @entry: the element to delete from the list.
		* Note: list_empty() on entry does not return true after this, the entry is
		* in an undefined state.
		*/
		static inline void list_del(struct list_head *entry)
		{
		__list_del(entry->prev, entry->next);
		entry->next = (struct list_head*)LIST_POISON1;
		entry->prev = (struct list_head*)LIST_POISON2;
		}
		#endif