diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2008-08-08 07:56:07 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2008-08-08 07:56:07 +0000 |
| commit | e55b32ab627bac2108efb4a3d5b924e00ff60af9 (patch) | |
| tree | cd42e58d2102370e476ddff38a4b61b3d7556601 /payloads/libpayload/util/kconfig/lkc.h | |
| parent | dc93affe72b4e3162fde653da5c0ea0c84bd5e39 (diff) | |
Update the kconfig copy in libpayload to a much more recent one. Among
other things this supposedly also fixes a number of build issues on Mac OS X.
This is more or less the same version (i.e. equally recent) as we have in
coreinfo and buildrom now.
This patch also includes the libintl.h fix from r3475 (coreinfo).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3482 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'payloads/libpayload/util/kconfig/lkc.h')
| -rw-r--r-- | payloads/libpayload/util/kconfig/lkc.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/payloads/libpayload/util/kconfig/lkc.h b/payloads/libpayload/util/kconfig/lkc.h index 527f60c99c..459afaa03d 100644 --- a/payloads/libpayload/util/kconfig/lkc.h +++ b/payloads/libpayload/util/kconfig/lkc.h @@ -31,7 +31,7 @@ extern "C" { #define SRCTREE "srctree" -#define PACKAGE "linux" +#define PACKAGE "libpayload" #define LOCALEDIR "/usr/share/locale" #define _(text) gettext(text) @@ -40,6 +40,11 @@ extern "C" { #define TF_COMMAND 0x0001 #define TF_PARAM 0x0002 +#define TF_OPTION 0x0004 + +#define T_OPT_MODULES 1 +#define T_OPT_DEFCONFIG_LIST 2 +#define T_OPT_ENV 3 struct kconf_id { int name; @@ -60,15 +65,17 @@ int zconf_lineno(void); char *zconf_curname(void); /* confdata.c */ -extern const char conf_def_filename[]; - +const char *conf_get_configname(void); char *conf_get_default_confname(void); +void sym_set_change_count(int count); +void sym_add_change_count(int count); /* kconfig_load.c */ void kconfig_load(void); /* menu.c */ void menu_init(void); +void menu_warn(struct menu *menu, const char *fmt, ...); struct menu *menu_add_menu(void); void menu_end_menu(void); void menu_add_entry(struct symbol *sym); @@ -78,6 +85,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e 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_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); +void menu_add_option(int token, char *arg); void menu_finalize(struct menu *parent); void menu_set_type(int type); @@ -97,12 +105,16 @@ void str_printf(struct gstr *gs, const char *fmt, ...); const char *str_get(struct gstr *gs); /* symbol.c */ +extern struct expr *sym_env_list; + void sym_init(void); void sym_clear_all_valid(void); +void sym_set_all_changed(void); void sym_set_changed(struct symbol *sym); struct symbol *sym_check_deps(struct symbol *sym); struct property *prop_alloc(enum prop_type type, struct symbol *sym); struct symbol *prop_get_symbol(struct property *prop); +struct property *sym_get_env_prop(struct symbol *sym); static inline tristate sym_get_tristate_value(struct symbol *sym) { @@ -137,7 +149,7 @@ static inline bool sym_is_optional(struct symbol *sym) static inline bool sym_has_value(struct symbol *sym) { - return sym->flags & SYMBOL_NEW ? false : true; + return sym->flags & SYMBOL_DEF_USER ? true : false; } #ifdef __cplusplus |