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>
master
Masahiro Yamada
10 years ago
committed by
Tom Rini
parent
d6fc0cefd8
commit
9b5f0b1da9
@ -1,57 +1,52 @@ |
||||
#include <stdarg.h> |
||||
|
||||
/* confdata.c */ |
||||
P(conf_parse,void,(const char *name)); |
||||
P(conf_read,int,(const char *name)); |
||||
P(conf_read_simple,int,(const char *name, int)); |
||||
P(conf_write_defconfig,int,(const char *name)); |
||||
P(conf_write,int,(const char *name)); |
||||
P(conf_write_autoconf,int,(void)); |
||||
P(conf_get_changed,bool,(void)); |
||||
P(conf_set_changed_callback, void,(void (*fn)(void))); |
||||
P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap))); |
||||
void conf_parse(const char *name); |
||||
int conf_read(const char *name); |
||||
int conf_read_simple(const char *name, int); |
||||
int conf_write_defconfig(const char *name); |
||||
int conf_write(const char *name); |
||||
int conf_write_autoconf(void); |
||||
bool conf_get_changed(void); |
||||
void conf_set_changed_callback(void (*fn)(void)); |
||||
void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap)); |
||||
|
||||
/* menu.c */ |
||||
P(rootmenu,struct menu,); |
||||
extern struct menu rootmenu; |
||||
|
||||
P(menu_is_empty, bool, (struct menu *menu)); |
||||
P(menu_is_visible, bool, (struct menu *menu)); |
||||
P(menu_has_prompt, bool, (struct menu *menu)); |
||||
P(menu_get_prompt,const char *,(struct menu *menu)); |
||||
P(menu_get_root_menu,struct menu *,(struct menu *menu)); |
||||
P(menu_get_parent_menu,struct menu *,(struct menu *menu)); |
||||
P(menu_has_help,bool,(struct menu *menu)); |
||||
P(menu_get_help,const char *,(struct menu *menu)); |
||||
P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head |
||||
*head)); |
||||
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)); |
||||
bool menu_is_empty(struct menu *menu); |
||||
bool menu_is_visible(struct menu *menu); |
||||
bool menu_has_prompt(struct menu *menu); |
||||
const char * menu_get_prompt(struct menu *menu); |
||||
struct menu * menu_get_root_menu(struct menu *menu); |
||||
struct menu * menu_get_parent_menu(struct menu *menu); |
||||
bool menu_has_help(struct menu *menu); |
||||
const char * menu_get_help(struct menu *menu); |
||||
struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head); |
||||
void menu_get_ext_help(struct menu *menu, struct gstr *help); |
||||
|
||||
/* 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)); |
||||
P(sym_find,struct symbol *,(const char *name)); |
||||
P(sym_expand_string_value,const char *,(const char *in)); |
||||
P(sym_escape_string_value, const char *,(const char *in)); |
||||
P(sym_re_search,struct symbol **,(const char *pattern)); |
||||
P(sym_type_name,const char *,(enum symbol_type type)); |
||||
P(sym_calc_value,void,(struct symbol *sym)); |
||||
P(sym_get_type,enum symbol_type,(struct symbol *sym)); |
||||
P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri)); |
||||
P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri)); |
||||
P(sym_toggle_tristate_value,tristate,(struct symbol *sym)); |
||||
P(sym_string_valid,bool,(struct symbol *sym, const char *newval)); |
||||
P(sym_string_within_range,bool,(struct symbol *sym, const char *str)); |
||||
P(sym_set_string_value,bool,(struct symbol *sym, const char *newval)); |
||||
P(sym_is_changable,bool,(struct symbol *sym)); |
||||
P(sym_get_choice_prop,struct property *,(struct symbol *sym)); |
||||
P(sym_get_default_prop,struct property *,(struct symbol *sym)); |
||||
P(sym_get_string_value,const char *,(struct symbol *sym)); |
||||
struct symbol * sym_lookup(const char *name, int flags); |
||||
struct symbol * sym_find(const char *name); |
||||
const char * sym_expand_string_value(const char *in); |
||||
const char * sym_escape_string_value(const char *in); |
||||
struct symbol ** sym_re_search(const char *pattern); |
||||
const char * sym_type_name(enum symbol_type type); |
||||
void sym_calc_value(struct symbol *sym); |
||||
enum symbol_type sym_get_type(struct symbol *sym); |
||||
bool sym_tristate_within_range(struct symbol *sym,tristate tri); |
||||
bool sym_set_tristate_value(struct symbol *sym,tristate tri); |
||||
tristate sym_toggle_tristate_value(struct symbol *sym); |
||||
bool sym_string_valid(struct symbol *sym, const char *newval); |
||||
bool sym_string_within_range(struct symbol *sym, const char *str); |
||||
bool sym_set_string_value(struct symbol *sym, const char *newval); |
||||
bool sym_is_changable(struct symbol *sym); |
||||
struct property * sym_get_choice_prop(struct symbol *sym); |
||||
const char * sym_get_string_value(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 */ |
||||
P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2)); |
||||
P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)); |
||||
void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken); |
||||
|
||||
Loading…
Reference in new issue