Commit 6997e461 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

support/kconfig: upgrade to 3.9-rc2 



Our kconfig code is updated to the version of kernel 3.9-rc2. No major
issues during the migration, except:

 * Some conflicts when applying 03-change-config-option-prefix.patch
   due to upstream kernel changes.

 * The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix
   the make rule that generates the moc file for the Qt-based
   interface.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent cfe70c5e

support/kconfig/Makefile

+50 −95
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ else 
Kconfig := Kconfig

endif



# We need this, in case the user has it in its environment

unexport CONFIG_



xconfig: $(obj)/qconf

	$< $(Kconfig)
@@ -33,33 +36,9 @@ silentoldconfig: $(obj)/conf 
	$(Q)mkdir -p include/generated

	$< --$@ $(Kconfig)



# if no path is given, then use src directory to find file

ifdef LSMOD

LSMOD_F := $(LSMOD)

ifeq ($(findstring /,$(LSMOD)),)

  LSMOD_F := $(objtree)/$(LSMOD)

endif

endif



localmodconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)mkdir -p include/generated

	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config

	$(Q)if [ -f .config ]; then 					\

			cmp -s .tmp.config .config ||			\

			(mv -f .config .config.old.1;			\

			 mv -f .tmp.config .config;			\

			 $(obj)/conf --silentoldconfig $(Kconfig);	\

			 mv -f .config.old.1 .config.old)		\

	else								\

			mv -f .tmp.config .config;			\

			$(obj)/conf --silentoldconfig $(Kconfig);	\

	fi

	$(Q)rm -f .tmp.config



localyesconfig: $(obj)/streamline_config.pl $(obj)/conf

localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)mkdir -p include/generated

	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config

	$(Q)sed -i s/=m/=y/ .tmp.config

	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config

	$(Q)if [ -f .config ]; then 					\

			cmp -s .tmp.config .config ||			\

			(mv -f .config .config.old.1;			\
@@ -74,9 +53,8 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf 


# Create new linux.pot file

# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files

# The symlink is used to repair a deficiency in arch/um

update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h

	$(Q)echo "  GEN config"

	$(Q)echo "  GEN     config.pot"

	$(Q)xgettext --default-domain=linux                         \

	    --add-comments --keyword=_ --keyword=N_                 \

	    --from-code=UTF-8                                       \
@@ -84,16 +62,16 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	    --directory=$(srctree) --directory=$(objtree)           \

	    --output $(obj)/config.pot

	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot

	$(Q)ln -fs Kconfig.x86 arch/um/Kconfig

	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \

	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \

	    $(srctree)/arch/*/um/Kconfig`;               \

	    do                                           \

		echo "  GEN     $$i";                    \

		$(obj)/kxgettext $$i                     \

		     >> $(obj)/config.pot;               \

	    done )

	$(Q)echo "  GEN     linux.pot"

	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \

	    --output $(obj)/linux.pot

	$(Q)rm -f $(srctree)/arch/um/Kconfig

	$(Q)rm -f $(obj)/config.pot



PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -101,11 +79,17 @@ PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig 
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf

	$< --$@ $(Kconfig)



PHONY += listnewconfig oldnoconfig savedefconfig defconfig

PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig



listnewconfig oldnoconfig: $(obj)/conf

listnewconfig olddefconfig: $(obj)/conf

	$< --$@ $(Kconfig)



# oldnoconfig is an alias of olddefconfig, because people already are dependent

# on its behavior(sets new symbols to their default value but not 'n') with the

# counter-intuitive name.

oldnoconfig: $(obj)/conf

	$< --olddefconfig $(Kconfig)



savedefconfig: $(obj)/conf

	$< --$@=defconfig $(Kconfig)
@@ -139,7 +123,7 @@ help: 
	@echo  '  alldefconfig    - New config with all symbols set to default'

	@echo  '  randconfig	  - New config with random answer to all options'

	@echo  '  listnewconfig   - List new options'

	@echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'

	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their default value'



# lxdialog stuff

check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -170,8 +154,8 @@ mconf-objs := mconf.o zconf.tab.o $(lxdialog) 
nconf-objs     := nconf.o zconf.tab.o nconf.gui.o

kxgettext-objs	:= kxgettext.o zconf.tab.o

qconf-cxxobjs	:= qconf.o

qconf-objs	:= kconfig_load.o zconf.tab.o

gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o

qconf-objs	:= zconf.tab.o

gconf-objs	:= gconf.o zconf.tab.o



hostprogs-y := conf
@@ -203,8 +187,8 @@ ifeq ($(gconf-target),1) 
	hostprogs-y += gconf

endif



clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck

clean-files	+= zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h

clean-files	:= qconf.moc .tmp_qtcheck .tmp_gtkcheck

clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h

clean-files     += mconf qconf gconf nconf

clean-files     += config.pot linux.pot
@@ -220,15 +204,18 @@ always := dochecklxdialog 
HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))



# generated files seem to need this to find local include files

HOSTCFLAGS_lex.zconf.o	:= -I$(src)

HOSTCFLAGS_zconf.lex.o	:= -I$(src)

HOSTCFLAGS_zconf.tab.o	:= -I$(src)



HOSTLOADLIBES_qconf	= $(KC_QT_LIBS) -ldl

HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK

LEX_PREFIX_zconf	:= zconf

YACC_PREFIX_zconf	:= zconf



HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl

HOSTLOADLIBES_qconf	= $(KC_QT_LIBS)

HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS)



HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`

HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \

                          -D LKC_DIRECT_LINK

                          -Wno-missing-prototypes



HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
@@ -256,12 +243,12 @@ $(obj)/.tmp_qtcheck: 
	        if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \

	      done; \

	      if [ -z "$$dir" ]; then \

	        echo "*"; \

	        echo "* Unable to find any QT installation. Please make sure that"; \

	        echo "* the QT4 or QT3 development package is correctly installed and"; \

	        echo "* either qmake can be found or install pkg-config or set"; \

	        echo "* the QTDIR environment variable to the correct location."; \

	        echo "*"; \

	        echo >&2 "*"; \

	        echo >&2 "* Unable to find any QT installation. Please make sure that"; \

	        echo >&2 "* the QT4 or QT3 development package is correctly installed and"; \

	        echo >&2 "* either qmake can be found or install pkg-config or set"; \

	        echo >&2 "* the QTDIR environment variable to the correct location."; \

	        echo >&2 "*"; \

	        false; \

	      fi; \

	      libpath=$$dir/lib; lib=qt; osdir=""; \
@@ -282,8 +269,8 @@ $(obj)/.tmp_qtcheck: 
	else \

	  cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \

	  libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \

	  binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \

	  moc="$$binpath/bin/moc"; \

	  moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \

	  [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \

	fi; \

	echo "KC_QT_CFLAGS=$$cflags" > $@; \

	echo "KC_QT_LIBS=$$libs" >> $@; \
@@ -301,62 +288,30 @@ $(obj)/.tmp_gtkcheck: 
		if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then			\

			touch $@;								\

		else									\

			echo "*"; 							\

			echo "* GTK+ is present but version >= 2.0.0 is required.";	\

			echo "*";							\

			echo >&2 "*"; 							\

			echo >&2 "* GTK+ is present but version >= 2.0.0 is required.";	\

			echo >&2 "*";							\

			false;								\

		fi									\

	else										\

		echo "*"; 								\

		echo "* Unable to find the GTK+ installation. Please make sure that"; 	\

		echo "* the GTK+ 2.0 development package is correctly installed..."; 	\

		echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; 		\

		echo "*"; 								\

		echo >&2 "*"; 								\

		echo >&2 "* Unable to find the GTK+ installation. Please make sure that"; 	\

		echo >&2 "* the GTK+ 2.0 development package is correctly installed..."; 	\

		echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; 		\

		echo >&2 "*"; 								\

		false;									\

	fi

endif



$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c



$(obj)/kconfig_load.o: $(obj)/lkc_defs.h



$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h

$(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c



$(obj)/gconf.o: $(obj)/lkc_defs.h

$(obj)/qconf.o: $(obj)/qconf.moc



$(obj)/%.moc: $(src)/%.h

$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck

	$(KC_QT_MOC) -i $< -o $@



$(obj)/lkc_defs.h: $(src)/lkc_proto.h

	$(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'



# Extract gconf menu items for I18N support

$(obj)/gconf.glade.h: $(obj)/gconf.glade

	$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \

	$(obj)/gconf.glade

###

# The following requires flex/bison/gperf

# By default we use the _shipped versions, uncomment the following line if

# you are modifying the flex/bison src.

# LKC_GENPARSER := 1



ifdef LKC_GENPARSER



$(obj)/zconf.tab.c: $(src)/zconf.y

$(obj)/lex.zconf.c: $(src)/zconf.l

$(obj)/zconf.hash.c: $(src)/zconf.gperf



%.tab.c: %.y

	bison -l -b $* -p $(notdir $*) $<

	cp $@ $@_shipped



lex.%.c: %.l

	flex -L -P$(notdir $*) -o$@ $<

	cp $@ $@_shipped



%.hash.c: %.gperf

	gperf < $< > $@

	cp $@ $@_shipped



endif

support/kconfig/README.buildroot2

+1 −1
Original line number Diff line number Diff line 
This is a copy of the kconfig code in the kernel (currently 2.6.37-rc1) tweaked

This is a copy of the kconfig code in the kernel (currently 3.9-rc2) tweaked

to suit Buildroot.



To update:

support/kconfig/conf.c

+75 −23
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
#include <sys/stat.h>

#include <sys/time.h>



#define LKC_DIRECT_LINK

#include "lkc.h"



static void conf(struct menu *menu);

static void check_conf(struct menu *menu);

static void xfgets(char *str, int size, FILE *in);



enum input_mode {

	oldaskconfig,
@@ -32,12 +32,11 @@ enum input_mode { 
	defconfig,

	savedefconfig,

	listnewconfig,

	oldnoconfig,

	olddefconfig,

} input_mode = oldaskconfig;



char *defconfig_file;



static int indent = 1;

static int tty_stdio;

static int valid_stdin = 1;

static int sync_kconfig;

static int conf_cnt;
@@ -106,9 +105,12 @@ static int conf_askvalue(struct symbol *sym, const char *def) 
			return 0;

		}

		check_stdin();

		/* fall through */

	case oldaskconfig:

		fflush(stdout);

		xfgets(line, 128, stdin);

		if (!tty_stdio)

			printf("\n");

		return 1;

	default:

		break;
@@ -150,6 +152,7 @@ static int conf_string(struct menu *menu) 
				def = NULL;

				break;

			}

			/* fall through */

		default:

			line[strlen(line)-1] = 0;

			def = line;
@@ -304,6 +307,7 @@ static int conf_choice(struct menu *menu) 
				break;

			}

			check_stdin();

			/* fall through */

		case oldaskconfig:

			fflush(stdout);

			xfgets(line, 128, stdin);
@@ -364,11 +368,12 @@ static void conf(struct menu *menu) 
		case P_MENU:

			if ((input_mode == silentoldconfig ||

			     input_mode == listnewconfig ||

			     input_mode == oldnoconfig) &&

			     input_mode == olddefconfig) &&

			    rootEntry != menu) {

				check_conf(menu);

				return;

			}

			/* fall through */

		case P_COMMENT:

			prompt = menu_get_prompt(menu);

			if (prompt)
@@ -427,7 +432,7 @@ static void check_conf(struct menu *menu) 
				if (sym->name && !sym_is_choice_value(sym)) {

					printf("%s%s\n", CONFIG_, sym->name);

				}

			} else if (input_mode != oldnoconfig) {

			} else if (input_mode != olddefconfig) {

				if (!conf_cnt++)

					printf(_("*\n* Restart config...\n*\n"));

				rootEntry = menu_get_parent_menu(menu);
@@ -452,20 +457,49 @@ static struct option long_opts[] = { 
	{"alldefconfig",    no_argument,       NULL, alldefconfig},

	{"randconfig",      no_argument,       NULL, randconfig},

	{"listnewconfig",   no_argument,       NULL, listnewconfig},

	{"oldnoconfig",     no_argument,       NULL, oldnoconfig},

	{"olddefconfig",    no_argument,       NULL, olddefconfig},

	/*

	 * oldnoconfig is an alias of olddefconfig, because people already

	 * are dependent on its behavior(sets new symbols to their default

	 * value but not 'n') with the counter-intuitive name.

	 */

	{"oldnoconfig",     no_argument,       NULL, olddefconfig},

	{NULL, 0, NULL, 0}

};



static void conf_usage(const char *progname)

{



	printf("Usage: %s [option] <kconfig-file>\n", progname);

	printf("[option] is _one_ of the following:\n");

	printf("  --listnewconfig         List new options\n");

	printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");

	printf("  --oldconfig             Update a configuration using a provided .config as base\n");

	printf("  --silentoldconfig       Same as oldconfig, but quietly, additionally update deps\n");

	printf("  --olddefconfig          Same as silentoldconfig but sets new symbols to their default value\n");

	printf("  --oldnoconfig           An alias of olddefconfig\n");

	printf("  --defconfig <file>      New config with default defined in <file>\n");

	printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");

	printf("  --allnoconfig           New config where all options are answered with no\n");

	printf("  --allyesconfig          New config where all options are answered with yes\n");

	printf("  --allmodconfig          New config where all options are answered with mod\n");

	printf("  --alldefconfig          New config with all symbols set to default\n");

	printf("  --randconfig            New config with random answer to all options\n");

}



int main(int ac, char **av)

{

	const char *progname = av[0];

	int opt;

	const char *name;

	const char *name, *defconfig_file = NULL /* gcc uninit */;

	struct stat tmpstat;



	setlocale(LC_ALL, "");

	bindtextdomain(PACKAGE, LOCALEDIR);

	textdomain(PACKAGE);



	tty_stdio = isatty(0) && isatty(1) && isatty(2);



	while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) {

		input_mode = (enum input_mode)opt;

		switch (opt) {
@@ -491,14 +525,24 @@ int main(int ac, char **av) 
			srand(seed);

			break;

		}

		case oldaskconfig:

		case oldconfig:

		case allnoconfig:

		case allyesconfig:

		case allmodconfig:

		case alldefconfig:

		case listnewconfig:

		case olddefconfig:

			break;

		case '?':

			fprintf(stderr, _("See README for usage info\n"));

			conf_usage(progname);

			exit(1);

			break;

		}

	}

	if (ac == optind) {

		printf(_("%s: Kconfig file missing\n"), av[0]);

		conf_usage(progname);

		exit(1);

	}

	name = av[optind];
@@ -532,7 +576,7 @@ int main(int ac, char **av) 
	case oldaskconfig:

	case oldconfig:

	case listnewconfig:

	case oldnoconfig:

	case olddefconfig:

		conf_read(NULL);

		break;

	case allnoconfig:
@@ -541,8 +585,15 @@ int main(int ac, char **av) 
	case alldefconfig:

	case randconfig:

		name = getenv("KCONFIG_ALLCONFIG");

		if (name && !stat(name, &tmpstat)) {

			conf_read_simple(name, S_DEF_USER);

		if (!name)

			break;

		if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {

			if (conf_read_simple(name, S_DEF_USER)) {

				fprintf(stderr,

					_("*** Can't read seed configuration \"%s\"!\n"),

					name);

				exit(1);

			}

			break;

		}

		switch (input_mode) {
@@ -553,10 +604,13 @@ int main(int ac, char **av) 
		case randconfig:	name = "allrandom.config"; break;

		default: break;

		}

		if (!stat(name, &tmpstat))

			conf_read_simple(name, S_DEF_USER);

		else if (!stat("all.config", &tmpstat))

			conf_read_simple("all.config", S_DEF_USER);

		if (conf_read_simple(name, S_DEF_USER) &&

		    conf_read_simple("all.config", S_DEF_USER)) {

			fprintf(stderr,

				_("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),

				name);

			exit(1);

		}

		break;

	default:

		break;
@@ -571,7 +625,7 @@ int main(int ac, char **av) 
				return 1;

			}

		}

		valid_stdin = isatty(0) && isatty(1) && isatty(2);

		valid_stdin = tty_stdio;

	}



	switch (input_mode) {
@@ -602,7 +656,7 @@ int main(int ac, char **av) 
		/* fall through */

	case oldconfig:

	case listnewconfig:

	case oldnoconfig:

	case olddefconfig:

	case silentoldconfig:

		/* Update until a loop caused no more changes */

		do {
@@ -610,7 +664,7 @@ int main(int ac, char **av) 
			check_conf(&rootmenu);

		} while (conf_cnt &&

			 (input_mode != listnewconfig &&

			  input_mode != oldnoconfig));

			  input_mode != olddefconfig));

		break;

	}
@@ -640,13 +694,11 @@ int main(int ac, char **av) 
	}

	return 0;

}



/*

 * Helper function to facilitate fgets() by Jean Sacren.

 */

void xfgets(str, size, in)

	char *str;

	int size;

	FILE *in;

void xfgets(char *str, int size, FILE *in)

{

	if (fgets(str, size, in) == NULL)

		fprintf(stderr, "\nError in reading or end of file.\n");

support/kconfig/confdata.c

+247 −122

File changed.

Preview size limit exceeded, changes collapsed.

support/kconfig/expr.c

+5 −10
Original line number Diff line number Diff line
@@ -7,15 +7,13 @@ 
#include <stdlib.h>

#include <string.h>



#define LKC_DIRECT_LINK

#include "lkc.h"



#define DEBUG_EXPR	0



struct expr *expr_alloc_symbol(struct symbol *sym)

{

	struct expr *e = malloc(sizeof(*e));

	memset(e, 0, sizeof(*e));

	struct expr *e = xcalloc(1, sizeof(*e));

	e->type = E_SYMBOL;

	e->left.sym = sym;

	return e;
@@ -23,8 +21,7 @@ struct expr *expr_alloc_symbol(struct symbol *sym) 


struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)

{

	struct expr *e = malloc(sizeof(*e));

	memset(e, 0, sizeof(*e));

	struct expr *e = xcalloc(1, sizeof(*e));

	e->type = type;

	e->left.expr = ce;

	return e;
@@ -32,8 +29,7 @@ struct expr *expr_alloc_one(enum expr_type type, struct expr *ce) 


struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2)

{

	struct expr *e = malloc(sizeof(*e));

	memset(e, 0, sizeof(*e));

	struct expr *e = xcalloc(1, sizeof(*e));

	e->type = type;

	e->left.expr = e1;

	e->right.expr = e2;
@@ -42,8 +38,7 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e 


struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2)

{

	struct expr *e = malloc(sizeof(*e));

	memset(e, 0, sizeof(*e));

	struct expr *e = xcalloc(1, sizeof(*e));

	e->type = type;

	e->left.sym = s1;

	e->right.sym = s2;
@@ -71,7 +66,7 @@ struct expr *expr_copy(const struct expr *org) 
	if (!org)

		return NULL;



	e = malloc(sizeof(*org));

	e = xmalloc(sizeof(*org));

	memcpy(e, org, sizeof(*org));

	switch (org->type) {

	case E_SYMBOL: