mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 00:52:01 +00:00
6840999b19
Simplify "make ARCH=x86" and fix kconfig so we again can set 64BIT in all.config. For a fix the diffstat is nice: 6 files changed, 3 insertions(+), 36 deletions(-) The patch reverts these commits: -0f855aa64b("kconfig: add helper to set config symbol from environment variable") -2a113281f5("kconfig: use $K64BIT to set 64BIT with all*config targets") Roman Zippel pointed out that kconfig supported string compares so the additional complexity introduced by the above two patches were not needed. With this patch we have following behaviour: # make {allno,allyes,allmod,rand}config [ARCH=...] option \ host arch | 32bit | 64bit ===================================================== ./. | 32bit | 64bit ARCH=x86 | 32bit | 32bit ARCH=i386 | 32bit | 32bit ARCH=x86_64 | 64bit | 64bit The general rule are that ARCH= and native architecture takes precedence over the configuration. So make ARCH=i386 [whatever] will always build a 32-bit kernel no matter what the configuration says. The configuration will be updated to 32-bit if it was configured to 64-bit and the other way around. This behaviour is consistent with previous behaviour so no suprises here. make ARCH=x86 will per default result in a 32-bit kernel but as the only ARCH= value x86 allow the user to select between 32-bit and 64-bit using menuconfig. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Andreas Herrmann <aherrman@arcor.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
46 lines
1.9 KiB
C
46 lines
1.9 KiB
C
|
|
/* 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,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)));
|
|
|
|
/* menu.c */
|
|
P(rootmenu,struct menu,);
|
|
|
|
P(menu_is_visible,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));
|
|
|
|
/* symbol.c */
|
|
P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
|
|
|
|
P(sym_lookup,struct symbol *,(const char *name, int isconst));
|
|
P(sym_find,struct symbol *,(const char *name));
|
|
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));
|
|
|
|
P(prop_get_type_name,const char *,(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));
|