Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

kconfig: sync with Linux 4.1

Browse source 
Update the files under scripts/kconfig/ to match Linux 4.1.
Some Kconfig sources have diverged from those in the kernel,
so commit-base syncing was done not to lose U-Boot specific updates.

The commits cherry-picked from Linux are:

[1] commit be8af2d54a66911693eddc556e4f7a866670082b
    Author: Bjørn Forsman <bjorn.forsman@gmail.com>
    kconfig/lxdialog: get ncurses CFLAGS with pkg-config

[2] commit 3943f42c11896ce82ad3da132c8a5630313bdd0e
    Author: Andrey Utkin <andrey.krieger.utkin@gmail.com>
    Replace mentions of "list_struct" to "list_head"

[3] commit e4e458b45c5861808674eebfea94cee2258bb2ea
    Author: Arjun Sreedharan <arjun024@gmail.com>
    calloc/xcalloc: Fix argument order

[4] commit 09950bc256e3628d275f90e016e6f5a039fbdcab
    Author: Olof Johansson <olof@lixom.net>
    merge_config.sh: Display usage if given too few arguments

[5] commit b6a2ab2cd4739a9573ed41677e53171987b8da34
    Author: Colin Ian King <colin.king@canonical.com>
    kconfig: use va_end to match corresponding va_start

[6] commit 70529b1a1784503169416df19ce3d68746401340
    Author: Michal Marek <mmarek@suse.cz>
    kconfig: Get rid of the P() macro in headers

[7] commit 463157444e377bf9b279101b1f16a94c4648c03a
    Author: Michal Marek <mmarek@suse.cz>
    kconfig: Remove dead code

[8] commit ad8d40cda3ad22ad9e8863d55a5c88f85c0173f0
    Author: Michal Marek <mmarek@suse.cz>
    kconfig: Remove unnecessary prototypes from headers

[9] commit de4619937229378e81f95e99c9866acc8e207d34
    Author: Masahiro Yamada <yamada.masahiro@socionext.com>
    kbuild: mergeconfig: fix "jobserver unavailable" warning

[10] commit b9fe99c5b994c6ddc57780993966b18899526c0b
    Author: Masahiro Yamada <yamada.masahiro@socionext.com>
    kbuild: mergeconfig: move an error check to merge_config.sh

[11] commit 371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d
    Author: Masahiro Yamada <yamada.masahiro@socionext.com>
    kbuild: mergeconfig: remove redundant $(objtree)

[12] commit 3a975b8cfcbe026b535f83bde9a3c009bae214f9
    Author: Masahiro Yamada <yamada.masahiro@socionext.com>
    merge_config.sh: improve indentation

[13] commit bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd
    Author: Masahiro Yamada <yamada.masahiro@socionext.com>
    merge_config.sh: rename MAKE to RUNMAKE

[14] commit 63a91033d52e64a22e571fe84924c0b7f21c280d
    Author: Masahiro Yamada <yamada.masahiro@socionext.com>
    kbuild: add generic mergeconfig target, %.config

[15] commit 1cba0c305758c3c1786ecaceb03e142c95a4edc9
    Author: Michal Marek <mmarek@suse.cz>
    kconfig: Simplify Makefile

[16] commit 0a1f00a1c86421cc07cec87011c7cf4df68ee54b
    Author: Michal Marek <mmarek@suse.cz>
    kconfig: Do not print status messages in make -s mode

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Masahiro Yamada 2015-07-05 01:56:54 +09:00 committed by Tom Rini
parent d6fc0cefd8
commit 9b5f0b1da9
17 changed files with 189 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
scripts/kconfig/Makefile
View file

@ -2,7 +2,7 @@
# Kernel configuration targets # Kernel configuration targets
# These targets are used from top-level makefile # These targets are used from top-level makefile
PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \
localmodconfig localyesconfig localmodconfig localyesconfig
# Added for U-Boot # Added for U-Boot
@ -17,30 +17,31 @@ else
Kconfig := Kconfig Kconfig := Kconfig
endif endif
ifeq ($(quiet),silent_)
silent := -s
endif
# We need this, in case the user has it in its environment # We need this, in case the user has it in its environment
unexport CONFIG_ unexport CONFIG_
xconfig: $(obj)/qconf xconfig: $(obj)/qconf
$< $(Kconfig) $< $(silent) $(Kconfig)
gconfig: $(obj)/gconf gconfig: $(obj)/gconf
$< $(Kconfig) $< $(silent) $(Kconfig)
menuconfig: $(obj)/mconf menuconfig: $(obj)/mconf
$< $(Kconfig) $< $(silent) $(Kconfig)
config: $(obj)/conf config: $(obj)/conf
$< --oldaskconfig $(Kconfig) $< $(silent) --oldaskconfig $(Kconfig)
nconfig: $(obj)/nconf nconfig: $(obj)/nconf
$< $(Kconfig) $< $(silent) $(Kconfig)
oldconfig: $(obj)/conf
$< --$@ $(Kconfig)
silentoldconfig: $(obj)/conf silentoldconfig: $(obj)/conf
$(Q)mkdir -p include/config include/generated $(Q)mkdir -p include/config include/generated
$< --$@ $(Kconfig) $< $(silent) --$@ $(Kconfig)
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)mkdir -p include/config include/generated $(Q)mkdir -p include/config include/generated
@ -49,18 +50,18 @@ localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
cmp -s .tmp.config .config || \ cmp -s .tmp.config .config || \
(mv -f .config .config.old.1; \ (mv -f .config .config.old.1; \
mv -f .tmp.config .config; \ mv -f .tmp.config .config; \
$(obj)/conf --silentoldconfig $(Kconfig); \ $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
mv -f .config.old.1 .config.old) \ mv -f .config.old.1 .config.old) \
else \ else \
mv -f .tmp.config .config; \ mv -f .tmp.config .config; \
$(obj)/conf --silentoldconfig $(Kconfig); \ $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
fi fi
$(Q)rm -f .tmp.config $(Q)rm -f .tmp.config
# Create new linux.pot file # Create new linux.pot file
# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
$(Q)echo " GEN config.pot" $(Q)$(kecho) " GEN config.pot"
$(Q)xgettext --default-domain=linux \ $(Q)xgettext --default-domain=linux \
--add-comments --keyword=_ --keyword=N_ \ --add-comments --keyword=_ --keyword=N_ \
--from-code=UTF-8 \ --from-code=UTF-8 \
@ -71,65 +72,62 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
$(Q)(for i in `ls $(srctree)/arch/*/Kconfig \ $(Q)(for i in `ls $(srctree)/arch/*/Kconfig \
$(srctree)/arch/*/um/Kconfig`; \ $(srctree)/arch/*/um/Kconfig`; \
do \ do \
echo " GEN $$i"; \ $(kecho) " GEN $$i"; \
$(obj)/kxgettext $$i \ $(obj)/kxgettext $$i \
>> $(obj)/config.pot; \ >> $(obj)/config.pot; \
done ) done )
$(Q)echo " GEN linux.pot" $(Q)$(kecho) " GEN linux.pot"
$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
--output $(obj)/linux.pot --output $(obj)/linux.pot
$(Q)rm -f $(obj)/config.pot $(Q)rm -f $(obj)/config.pot
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig # These targets map 1:1 to the commandline options of 'conf'
simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
alldefconfig randconfig listnewconfig olddefconfig
PHONY += $(simple-targets)
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf $(simple-targets): $(obj)/conf
$< --$@ $(Kconfig) $< $(silent) --$@ $(Kconfig)
PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig PHONY += oldnoconfig savedefconfig defconfig
listnewconfig olddefconfig: $(obj)/conf
$< --$@ $(Kconfig)
# oldnoconfig is an alias of olddefconfig, because people already are dependent # 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 # on its behavior(sets new symbols to their default value but not 'n') with the
# counter-intuitive name. # counter-intuitive name.
oldnoconfig: $(obj)/conf oldnoconfig: olddefconfig
$< --olddefconfig $(Kconfig)
savedefconfig: $(obj)/conf savedefconfig: $(obj)/conf
$< --$@=defconfig $(Kconfig) $< $(silent) --$@=defconfig $(Kconfig)
defconfig: $(obj)/conf defconfig: $(obj)/conf
ifeq ($(KBUILD_DEFCONFIG),) ifeq ($(KBUILD_DEFCONFIG),)
$< --defconfig $(Kconfig) $< $(silent) --defconfig $(Kconfig)
else else
@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
endif endif
%_defconfig: $(obj)/conf %_defconfig: $(obj)/conf
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
# Added for U-Boot (backward compatibility) # Added for U-Boot (backward compatibility)
%_config: %_defconfig %_config: %_defconfig
@: @:
configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config) configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
define mergeconfig %.config: $(obj)/conf
$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target)) $(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
$(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture)) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1)) +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
endef
PHONY += kvmconfig PHONY += kvmconfig
kvmconfig: kvmconfig: kvm_guest.config
$(call mergeconfig,kvm_guest) @:
PHONY += tinyconfig PHONY += tinyconfig
tinyconfig: allnoconfig tinyconfig:
$(call mergeconfig,tiny) $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
# Help text used by make help # Help text used by make help
help: help:
@ -231,7 +229,7 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
# QT needs some extra effort... # QT needs some extra effort...
$(obj)/.tmp_qtcheck: $(obj)/.tmp_qtcheck:
@set -e; echo " CHECK qt"; dir=""; pkg=""; \ @set -e; $(kecho) " CHECK qt"; dir=""; pkg=""; \
if ! pkg-config --exists QtCore 2> /dev/null; then \ if ! pkg-config --exists QtCore 2> /dev/null; then \
echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \ echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \
pkg-config --exists qt 2> /dev/null && pkg=qt; \ pkg-config --exists qt 2> /dev/null && pkg=qt; \

8
scripts/kconfig/conf.c
View file

@ -471,7 +471,7 @@ static struct option long_opts[] = {
static void conf_usage(const char *progname) static void conf_usage(const char *progname)
{ {
printf("Usage: %s [option] <kconfig-file>\n", progname); printf("Usage: %s [-s] [option] <kconfig-file>\n", progname);
printf("[option] is _one_ of the following:\n"); printf("[option] is _one_ of the following:\n");
printf(" --listnewconfig List new options\n"); printf(" --listnewconfig List new options\n");
printf(" --oldaskconfig Start a new configuration using a line-oriented program\n"); printf(" --oldaskconfig Start a new configuration using a line-oriented program\n");
@ -501,7 +501,11 @@ int main(int ac, char **av)
tty_stdio = isatty(0) && isatty(1) && isatty(2); tty_stdio = isatty(0) && isatty(1) && isatty(2);
while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) { while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
if (opt == 's') {
conf_set_message_callback(NULL);
continue;
}
input_mode = (enum input_mode)opt; input_mode = (enum input_mode)opt;
switch (opt) { switch (opt) {
case silentoldconfig: case silentoldconfig:

6
scripts/kconfig/confdata.c
View file

@ -16,6 +16,11 @@
#include "lkc.h" #include "lkc.h"
struct conf_printer {
void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
void (*print_comment)(FILE *, const char *, void *);
};
static void conf_warning(const char *fmt, ...) static void conf_warning(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
@ -59,6 +64,7 @@ static void conf_message(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
if (conf_message_callback) if (conf_message_callback)
conf_message_callback(fmt, ap); conf_message_callback(fmt, ap);
va_end(ap);
} }
const char *conf_get_configname(void) const char *conf_get_configname(void)

22
scripts/kconfig/expr.c
View file

@ -11,6 +11,12 @@
#define DEBUG_EXPR 0 #define DEBUG_EXPR 0
static int expr_eq(struct expr *e1, struct expr *e2);
static struct expr *expr_eliminate_yn(struct expr *e);
static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
struct expr *expr_alloc_symbol(struct symbol *sym) struct expr *expr_alloc_symbol(struct symbol *sym)
{ {
struct expr *e = xcalloc(1, sizeof(*e)); struct expr *e = xcalloc(1, sizeof(*e));
@ -186,7 +192,7 @@ void expr_eliminate_eq(struct expr **ep1, struct expr **ep2)
#undef e1 #undef e1
#undef e2 #undef e2
int expr_eq(struct expr *e1, struct expr *e2) static int expr_eq(struct expr *e1, struct expr *e2)
{ {
int res, old_count; int res, old_count;
@ -228,7 +234,7 @@ int expr_eq(struct expr *e1, struct expr *e2)
return 0; return 0;
} }
struct expr *expr_eliminate_yn(struct expr *e) static struct expr *expr_eliminate_yn(struct expr *e)
{ {
struct expr *tmp; struct expr *tmp;
@ -823,7 +829,7 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
return false; return false;
} }
struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2) static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
{ {
struct expr *tmp = NULL; struct expr *tmp = NULL;
expr_extract_eq(E_AND, &tmp, ep1, ep2); expr_extract_eq(E_AND, &tmp, ep1, ep2);
@ -834,7 +840,7 @@ struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
return tmp; return tmp;
} }
struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2) static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
{ {
struct expr *tmp = NULL; struct expr *tmp = NULL;
expr_extract_eq(E_OR, &tmp, ep1, ep2); expr_extract_eq(E_OR, &tmp, ep1, ep2);
@ -845,7 +851,7 @@ struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
return tmp; return tmp;
} }
void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2) static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)
{ {
#define e1 (*ep1) #define e1 (*ep1)
#define e2 (*ep2) #define e2 (*ep2)
@ -976,11 +982,8 @@ tristate expr_calc_value(struct expr *e)
} }
} }
int expr_compare_type(enum expr_type t1, enum expr_type t2) static int expr_compare_type(enum expr_type t1, enum expr_type t2)
{ {
#if 0
return 1;
#else
if (t1 == t2) if (t1 == t2)
return 0; return 0;
switch (t1) { switch (t1) {
@ -1005,7 +1008,6 @@ int expr_compare_type(enum expr_type t1, enum expr_type t2)
} }
printf("[%dgt%d?]", t1, t2); printf("[%dgt%d?]", t1, t2);
return 0; return 0;
#endif
} }
static inline struct expr * static inline struct expr *

5
scripts/kconfig/expr.h
View file

@ -205,18 +205,13 @@ struct expr *expr_alloc_and(struct expr *e1, struct expr *e2);
struct expr *expr_alloc_or(struct expr *e1, struct expr *e2); struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);
struct expr *expr_copy(const struct expr *org); struct expr *expr_copy(const struct expr *org);
void expr_free(struct expr *e); void expr_free(struct expr *e);
int expr_eq(struct expr *e1, struct expr *e2);
void expr_eliminate_eq(struct expr **ep1, struct expr **ep2); void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);
tristate expr_calc_value(struct expr *e); tristate expr_calc_value(struct expr *e);
struct expr *expr_eliminate_yn(struct expr *e);
struct expr *expr_trans_bool(struct expr *e); struct expr *expr_trans_bool(struct expr *e);
struct expr *expr_eliminate_dups(struct expr *e); struct expr *expr_eliminate_dups(struct expr *e);
struct expr *expr_transform(struct expr *e); struct expr *expr_transform(struct expr *e);
int expr_contains_symbol(struct expr *dep, struct symbol *sym); int expr_contains_symbol(struct expr *dep, struct symbol *sym);
bool expr_depends_symbol(struct expr *dep, struct symbol *sym); bool expr_depends_symbol(struct expr *dep, struct symbol *sym);
struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym); struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);
struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2); struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2);

29
scripts/kconfig/gconf.c
View file

@ -169,14 +169,6 @@ void init_main_window(const gchar * glade_file)
style = gtk_widget_get_style(main_wnd); style = gtk_widget_get_style(main_wnd);
widget = glade_xml_get_widget(xml, "toolbar1"); widget = glade_xml_get_widget(xml, "toolbar1");
#if 0 /* Use stock Gtk icons instead */
replace_button_icon(xml, main_wnd->window, style,
"button1", (gchar **) xpm_back);
replace_button_icon(xml, main_wnd->window, style,
"button2", (gchar **) xpm_load);
replace_button_icon(xml, main_wnd->window, style,
"button3", (gchar **) xpm_save);
#endif
replace_button_icon(xml, main_wnd->window, style, replace_button_icon(xml, main_wnd->window, style,
"button4", (gchar **) xpm_single_view); "button4", (gchar **) xpm_single_view);
replace_button_icon(xml, main_wnd->window, style, replace_button_icon(xml, main_wnd->window, style,
@ -184,22 +176,6 @@ void init_main_window(const gchar * glade_file)
replace_button_icon(xml, main_wnd->window, style, replace_button_icon(xml, main_wnd->window, style,
"button6", (gchar **) xpm_tree_view); "button6", (gchar **) xpm_tree_view);
#if 0
switch (view_mode) {
case SINGLE_VIEW:
widget = glade_xml_get_widget(xml, "button4");
g_signal_emit_by_name(widget, "clicked");
break;
case SPLIT_VIEW:
widget = glade_xml_get_widget(xml, "button5");
g_signal_emit_by_name(widget, "clicked");
break;
case FULL_VIEW:
widget = glade_xml_get_widget(xml, "button6");
g_signal_emit_by_name(widget, "clicked");
break;
}
#endif
txtbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w)); txtbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
tag1 = gtk_text_buffer_create_tag(txtbuf, "mytag1", tag1 = gtk_text_buffer_create_tag(txtbuf, "mytag1",
"foreground", "red", "foreground", "red",
@ -1498,9 +1474,12 @@ int main(int ac, char *av[])
case 'a': case 'a':
//showAll = 1; //showAll = 1;
break; break;
case 's':
conf_set_message_callback(NULL);
break;
case 'h': case 'h':
case '?': case '?':
printf("%s <config>\n", av[0]); printf("%s [-s] <config>\n", av[0]);
exit(0); exit(0);
} }
name = av[2]; name = av[2];

6
scripts/kconfig/list.h
View file

@ -34,7 +34,7 @@ struct list_head {
* list_entry - get the struct for this entry * list_entry - get the struct for this entry
* @ptr: the &struct list_head pointer. * @ptr: the &struct list_head pointer.
* @type: the type of the struct this is embedded in. * @type: the type of the struct this is embedded in.
* @member: the name of the list_struct within the struct. * @member: the name of the list_head within the struct.
*/ */
#define list_entry(ptr, type, member) \ #define list_entry(ptr, type, member) \
container_of(ptr, type, member) container_of(ptr, type, member)
@ -43,7 +43,7 @@ struct list_head {
* list_for_each_entry - iterate over list of given type * list_for_each_entry - iterate over list of given type
* @pos: the type * to use as a loop cursor. * @pos: the type * to use as a loop cursor.
* @head: the head for your list. * @head: the head for your list.
* @member: the name of the list_struct within the struct. * @member: the name of the list_head within the struct.
*/ */
#define list_for_each_entry(pos, head, member) \ #define list_for_each_entry(pos, head, member) \
for (pos = list_entry((head)->next, typeof(*pos), member); \ for (pos = list_entry((head)->next, typeof(*pos), member); \
@ -55,7 +55,7 @@ struct list_head {
* @pos: the type * to use as a loop cursor. * @pos: the type * to use as a loop cursor.
* @n: another type * to use as temporary storage * @n: another type * to use as temporary storage
* @head: the head for your list. * @head: the head for your list.
* @member: the name of the list_struct within the struct. * @member: the name of the list_head within the struct.
*/ */
#define list_for_each_entry_safe(pos, n, head, member) \ #define list_for_each_entry_safe(pos, n, head, member) \
for (pos = list_entry((head)->next, typeof(*pos), member), \ for (pos = list_entry((head)->next, typeof(*pos), member), \

14
scripts/kconfig/lkc.h
View file

@ -21,9 +21,7 @@ static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c;
extern "C" { extern "C" {
#endif #endif
#define P(name,type,arg) extern type name arg
#include "lkc_proto.h" #include "lkc_proto.h"
#undef P
#define SRCTREE "srctree" #define SRCTREE "srctree"
@ -70,9 +68,6 @@ struct kconf_id {
enum symbol_type stype; enum symbol_type stype;
}; };
extern int zconfdebug;
int zconfparse(void);
void zconfdump(FILE *out); void zconfdump(FILE *out);
void zconf_starthelp(void); void zconf_starthelp(void);
FILE *zconf_fopen(const char *name); FILE *zconf_fopen(const char *name);
@ -90,11 +85,6 @@ void sym_add_change_count(int count);
bool conf_set_all_new_symbols(enum conf_def_mode mode); bool conf_set_all_new_symbols(enum conf_def_mode mode);
void set_all_choice_values(struct symbol *csym); void set_all_choice_values(struct symbol *csym);
struct conf_printer {
void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
void (*print_comment)(FILE *, const char *, void *);
};
/* confdata.c and expr.c */ /* confdata.c and expr.c */
static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out) static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
{ {
@ -113,7 +103,6 @@ void menu_add_entry(struct symbol *sym);
void menu_end_entry(void); void menu_end_entry(void);
void menu_add_dep(struct expr *dep); void menu_add_dep(struct expr *dep);
void menu_add_visibility(struct expr *dep); void menu_add_visibility(struct expr *dep);
struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep);
struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
@ -137,7 +126,6 @@ struct gstr {
int max_width; int max_width;
}; };
struct gstr str_new(void); struct gstr str_new(void);
struct gstr str_assign(const char *s);
void str_free(struct gstr *gs); void str_free(struct gstr *gs);
void str_append(struct gstr *gs, const char *s); void str_append(struct gstr *gs, const char *s);
void str_printf(struct gstr *gs, const char *fmt, ...); void str_printf(struct gstr *gs, const char *fmt, ...);
@ -148,8 +136,6 @@ extern struct expr *sym_env_list;
void sym_init(void); void sym_init(void);
void sym_clear_all_valid(void); void sym_clear_all_valid(void);
void sym_set_all_changed(void);
void sym_set_changed(struct symbol *sym);
struct symbol *sym_choice_default(struct symbol *sym); struct symbol *sym_choice_default(struct symbol *sym);
const char *sym_get_string_default(struct symbol *sym); const char *sym_get_string_default(struct symbol *sym);
struct symbol *sym_check_deps(struct symbol *sym); struct symbol *sym_check_deps(struct symbol *sym);

85
scripts/kconfig/lkc_proto.h
View file

@ -1,57 +1,52 @@
#include <stdarg.h> #include <stdarg.h>
/* confdata.c */ /* confdata.c */
P(conf_parse,void,(const char *name)); void conf_parse(const char *name);
P(conf_read,int,(const char *name)); int conf_read(const char *name);
P(conf_read_simple,int,(const char *name, int)); int conf_read_simple(const char *name, int);
P(conf_write_defconfig,int,(const char *name)); int conf_write_defconfig(const char *name);
P(conf_write,int,(const char *name)); int conf_write(const char *name);
P(conf_write_autoconf,int,(void)); int conf_write_autoconf(void);
P(conf_get_changed,bool,(void)); bool conf_get_changed(void);
P(conf_set_changed_callback, void,(void (*fn)(void))); void conf_set_changed_callback(void (*fn)(void));
P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap))); void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap));
/* menu.c */ /* menu.c */
P(rootmenu,struct menu,); extern struct menu rootmenu;
P(menu_is_empty, bool, (struct menu *menu)); bool menu_is_empty(struct menu *menu);
P(menu_is_visible, bool, (struct menu *menu)); bool menu_is_visible(struct menu *menu);
P(menu_has_prompt, bool, (struct menu *menu)); bool menu_has_prompt(struct menu *menu);
P(menu_get_prompt,const char *,(struct menu *menu)); const char * menu_get_prompt(struct menu *menu);
P(menu_get_root_menu,struct menu *,(struct menu *menu)); struct menu * menu_get_root_menu(struct menu *menu);
P(menu_get_parent_menu,struct menu *,(struct menu *menu)); struct menu * menu_get_parent_menu(struct menu *menu);
P(menu_has_help,bool,(struct menu *menu)); bool menu_has_help(struct menu *menu);
P(menu_get_help,const char *,(struct menu *menu)); const char * menu_get_help(struct menu *menu);
P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
*head)); void menu_get_ext_help(struct menu *menu, struct gstr *help);
P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head
*head));
P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
/* symbol.c */ /* symbol.c */
P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]); extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
P(sym_lookup,struct symbol *,(const char *name, int flags)); struct symbol * sym_lookup(const char *name, int flags);
P(sym_find,struct symbol *,(const char *name)); struct symbol * sym_find(const char *name);
P(sym_expand_string_value,const char *,(const char *in)); const char * sym_expand_string_value(const char *in);
P(sym_escape_string_value, const char *,(const char *in)); const char * sym_escape_string_value(const char *in);
P(sym_re_search,struct symbol **,(const char *pattern)); struct symbol ** sym_re_search(const char *pattern);
P(sym_type_name,const char *,(enum symbol_type type)); const char * sym_type_name(enum symbol_type type);
P(sym_calc_value,void,(struct symbol *sym)); void sym_calc_value(struct symbol *sym);
P(sym_get_type,enum symbol_type,(struct symbol *sym)); enum symbol_type sym_get_type(struct symbol *sym);
P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri)); bool sym_tristate_within_range(struct symbol *sym,tristate tri);
P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri)); bool sym_set_tristate_value(struct symbol *sym,tristate tri);
P(sym_toggle_tristate_value,tristate,(struct symbol *sym)); tristate sym_toggle_tristate_value(struct symbol *sym);
P(sym_string_valid,bool,(struct symbol *sym, const char *newval)); bool sym_string_valid(struct symbol *sym, const char *newval);
P(sym_string_within_range,bool,(struct symbol *sym, const char *str)); bool sym_string_within_range(struct symbol *sym, const char *str);
P(sym_set_string_value,bool,(struct symbol *sym, const char *newval)); bool sym_set_string_value(struct symbol *sym, const char *newval);
P(sym_is_changable,bool,(struct symbol *sym)); bool sym_is_changable(struct symbol *sym);
P(sym_get_choice_prop,struct property *,(struct symbol *sym)); struct property * sym_get_choice_prop(struct symbol *sym);
P(sym_get_default_prop,struct property *,(struct symbol *sym)); const char * sym_get_string_value(struct symbol *sym);
P(sym_get_string_value,const char *,(struct symbol *sym));
P(prop_get_type_name,const char *,(enum prop_type type)); const char * prop_get_type_name(enum prop_type type);
/* expr.c */ /* expr.c */
P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2)); void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken);
P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken));

6
scripts/kconfig/lxdialog/check-lxdialog.sh
View file

@ -21,7 +21,11 @@ ldflags()
# Where is ncurses.h? # Where is ncurses.h?
ccflags() ccflags()
{ {
if [ -f /usr/include/ncursesw/curses.h ]; then if pkg-config --cflags ncursesw 2>/dev/null; then
echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
elif pkg-config --cflags ncurses 2>/dev/null; then
echo '-DCURSES_LOC="<ncurses.h>"'
elif [ -f /usr/include/ncursesw/curses.h ]; then
echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"' echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
echo ' -DNCURSES_WIDECHAR=1' echo ' -DNCURSES_WIDECHAR=1'
elif [ -f /usr/include/ncurses/ncurses.h ]; then elif [ -f /usr/include/ncurses/ncurses.h ]; then

35
scripts/kconfig/mconf.c
View file

@ -279,6 +279,7 @@ static int child_count;
static int single_menu_mode; static int single_menu_mode;
static int show_all_options; static int show_all_options;
static int save_and_exit; static int save_and_exit;
static int silent;
static void conf(struct menu *menu, struct menu *active_menu); static void conf(struct menu *menu, struct menu *active_menu);
static void conf_choice(struct menu *menu); static void conf_choice(struct menu *menu);
@ -330,10 +331,10 @@ static void set_subtitle(void)
list_for_each_entry(sp, &trail, entries) { list_for_each_entry(sp, &trail, entries) {
if (sp->text) { if (sp->text) {
if (pos) { if (pos) {
pos->next = xcalloc(sizeof(*pos), 1); pos->next = xcalloc(1, sizeof(*pos));
pos = pos->next; pos = pos->next;
} else { } else {
subtitles = pos = xcalloc(sizeof(*pos), 1); subtitles = pos = xcalloc(1, sizeof(*pos));
} }
pos->text = sp->text; pos->text = sp->text;
} }
@ -777,10 +778,12 @@ static void conf_message_callback(const char *fmt, va_list ap)
char buf[PATH_MAX+1]; char buf[PATH_MAX+1];
vsnprintf(buf, sizeof(buf), fmt, ap); vsnprintf(buf, sizeof(buf), fmt, ap);
if (save_and_exit) if (save_and_exit) {
printf("%s", buf); if (!silent)
else printf("%s", buf);
} else {
show_textbox(NULL, buf, 6, 60); show_textbox(NULL, buf, 6, 60);
}
} }
static void show_help(struct menu *menu) static void show_help(struct menu *menu)
@ -977,16 +980,18 @@ static int handle_exit(void)
} }
/* fall through */ /* fall through */
case -1: case -1:
printf(_("\n\n" if (!silent)
"*** End of the configuration.\n" printf(_("\n\n"
"*** Execute 'make' to start the build or try 'make help'." "*** End of the configuration.\n"
"\n\n")); "*** Execute 'make' to start the build or try 'make help'."
"\n\n"));
res = 0; res = 0;
break; break;
default: default:
fprintf(stderr, _("\n\n" if (!silent)
"Your configuration changes were NOT saved." fprintf(stderr, _("\n\n"
"\n\n")); "Your configuration changes were NOT saved."
"\n\n"));
if (res != KEY_ESC) if (res != KEY_ESC)
res = 0; res = 0;
} }
@ -1010,6 +1015,12 @@ int main(int ac, char **av)
signal(SIGINT, sig_handler); signal(SIGINT, sig_handler);
if (ac > 1 && strcmp(av[1], "-s") == 0) {
silent = 1;
/* Silence conf_read() until the real callback is set up */
conf_set_message_callback(NULL);
av++;
}
conf_parse(av[1]); conf_parse(av[1]);
conf_read(NULL); conf_read(NULL);

4
scripts/kconfig/menu.c
View file

@ -125,7 +125,7 @@ void menu_set_type(int type)
sym_type_name(sym->type), sym_type_name(type)); sym_type_name(sym->type), sym_type_name(type));
} }
struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep) static struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep)
{ {
struct property *prop = prop_alloc(type, current_entry->sym); struct property *prop = prop_alloc(type, current_entry->sym);
@ -615,7 +615,7 @@ static struct property *get_symbol_prop(struct symbol *sym)
/* /*
* head is optional and may be NULL * head is optional and may be NULL
*/ */
void get_symbol_str(struct gstr *r, struct symbol *sym, static void get_symbol_str(struct gstr *r, struct symbol *sym,
struct list_head *head) struct list_head *head)
{ {
bool hit; bool hit;

30
scripts/kconfig/merge_config.sh
View file

@ -35,7 +35,7 @@ usage() {
echo " -O dir to put generated output files" echo " -O dir to put generated output files"
} }
MAKE=true RUNMAKE=true
ALLTARGET=alldefconfig ALLTARGET=alldefconfig
WARNREDUN=false WARNREDUN=false
OUTPUT=. OUTPUT=.
@ -48,7 +48,7 @@ while true; do
continue continue
;; ;;
"-m") "-m")
MAKE=false RUNMAKE=false
shift shift
continue continue
;; ;;
@ -77,9 +77,19 @@ while true; do
esac esac
done done
if [ "$#" -lt 2 ] ; then
usage
exit
fi
INITFILE=$1 INITFILE=$1
shift; shift;
if [ ! -r "$INITFILE" ]; then
echo "The base file '$INITFILE' does not exist. Exit." >&2
exit 1
fi
MERGE_LIST=$* MERGE_LIST=$*
SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
@ -93,25 +103,23 @@ for MERGE_FILE in $MERGE_LIST ; do
CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE) CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
for CFG in $CFG_LIST ; do for CFG in $CFG_LIST ; do
grep -q -w $CFG $TMP_FILE grep -q -w $CFG $TMP_FILE || continue
if [ $? -eq 0 ] ; then PREV_VAL=$(grep -w $CFG $TMP_FILE)
PREV_VAL=$(grep -w $CFG $TMP_FILE) NEW_VAL=$(grep -w $CFG $MERGE_FILE)
NEW_VAL=$(grep -w $CFG $MERGE_FILE) if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
echo Value of $CFG is redefined by fragment $MERGE_FILE: echo Value of $CFG is redefined by fragment $MERGE_FILE:
echo Previous value: $PREV_VAL echo Previous value: $PREV_VAL
echo New value: $NEW_VAL echo New value: $NEW_VAL
echo echo
elif [ "$WARNREDUN" = "true" ]; then elif [ "$WARNREDUN" = "true" ]; then
echo Value of $CFG is redundant by fragment $MERGE_FILE: echo Value of $CFG is redundant by fragment $MERGE_FILE:
fi
sed -i "/$CFG[ =]/d" $TMP_FILE
fi fi
sed -i "/$CFG[ =]/d" $TMP_FILE
done done
cat $MERGE_FILE >> $TMP_FILE cat $MERGE_FILE >> $TMP_FILE
done done
if [ "$MAKE" = "false" ]; then if [ "$RUNMAKE" = "false" ]; then
cp $TMP_FILE $OUTPUT/.config cp $TMP_FILE $OUTPUT/.config
echo "#" echo "#"
echo "# merged configuration written to $OUTPUT/.config (needs make)" echo "# merged configuration written to $OUTPUT/.config (needs make)"

5
scripts/kconfig/nconf.c
View file

@ -1482,6 +1482,11 @@ int main(int ac, char **av)
bindtextdomain(PACKAGE, LOCALEDIR); bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE); textdomain(PACKAGE);
if (ac > 1 && strcmp(av[1], "-s") == 0) {
/* Silence conf_read() until the real callback is set up */
conf_set_message_callback(NULL);
av++;
}
conf_parse(av[1]); conf_parse(av[1]);
conf_read(NULL); conf_read(NULL);

5
scripts/kconfig/qconf.cc
View file

@ -1746,7 +1746,7 @@ static const char *progname;
static void usage(void) static void usage(void)
{ {
printf(_("%s <config>\n"), progname); printf(_("%s [-s] <config>\n"), progname);
exit(0); exit(0);
} }
@ -1762,6 +1762,9 @@ int main(int ac, char** av)
configApp = new QApplication(ac, av); configApp = new QApplication(ac, av);
if (ac > 1 && av[1][0] == '-') { if (ac > 1 && av[1][0] == '-') {
switch (av[1][1]) { switch (av[1][1]) {
case 's':
conf_set_message_callback(NULL);
break;
case 'h': case 'h':
case '?': case '?':
usage(); usage();

42
scripts/kconfig/symbol.c
View file

@ -112,7 +112,7 @@ struct property *sym_get_env_prop(struct symbol *sym)
return NULL; return NULL;
} }
struct property *sym_get_default_prop(struct symbol *sym) static struct property *sym_get_default_prop(struct symbol *sym)
{ {
struct property *prop; struct property *prop;
@ -186,6 +186,26 @@ static void sym_validate_range(struct symbol *sym)
sym->curr.val = strdup(str); sym->curr.val = strdup(str);
} }
static void sym_set_changed(struct symbol *sym)
{
struct property *prop;
sym->flags |= SYMBOL_CHANGED;
for (prop = sym->prop; prop; prop = prop->next) {
if (prop->menu)
prop->menu->flags |= MENU_CHANGED;
}
}
static void sym_set_all_changed(void)
{
struct symbol *sym;
int i;
for_all_symbols(i, sym)
sym_set_changed(sym);
}
static void sym_calc_visibility(struct symbol *sym) static void sym_calc_visibility(struct symbol *sym)
{ {
struct property *prop; struct property *prop;
@ -451,26 +471,6 @@ void sym_clear_all_valid(void)
sym_calc_value(modules_sym); sym_calc_value(modules_sym);
} }
void sym_set_changed(struct symbol *sym)
{
struct property *prop;
sym->flags |= SYMBOL_CHANGED;
for (prop = sym->prop; prop; prop = prop->next) {
if (prop->menu)
prop->menu->flags |= MENU_CHANGED;
}
}
void sym_set_all_changed(void)
{
struct symbol *sym;
int i;
for_all_symbols(i, sym)
sym_set_changed(sym);
}
bool sym_tristate_within_range(struct symbol *sym, tristate val) bool sym_tristate_within_range(struct symbol *sym, tristate val)
{ {
int type = sym_get_type(sym); int type = sym_get_type(sym);

10
scripts/kconfig/util.c
View file

@ -88,16 +88,6 @@ struct gstr str_new(void)
return gs; return gs;
} }
/* Allocate and assign growable string */
struct gstr str_assign(const char *s)
{
struct gstr gs;
gs.s = strdup(s);
gs.len = strlen(s) + 1;
gs.max_width = 0;
return gs;
}
/* Free storage for growable string */ /* Free storage for growable string */
void str_free(struct gstr *gs) void str_free(struct gstr *gs)
{ {