coreboot-gerrit April 2015

coreboot-gerrit@coreboot.org

1 participants
3044 discussions

New patch to review for coreboot: a4691d2 kbuild: trivial - remove trailing empty lines
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9311 -gerrit commit a4691d2d6eaaedb9ebd2f8c1564c517ed4d5cc6a Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Apr 6 01:26:08 2015 +0200 kbuild: trivial - remove trailing empty lines Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Change-Id: I019ba09f7371cff2699a6c854c478fec53e51126 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/kconfig/check.sh | 1 - util/kconfig/mconf.c | 1 - util/kconfig/nconf.c | 1 - util/kconfig/util.c | 2 -- 4 files changed, 5 deletions(-) diff --git a/util/kconfig/check.sh b/util/kconfig/check.sh index 854d9c7..55b79ba 100644 --- a/util/kconfig/check.sh +++ b/util/kconfig/check.sh @@ -11,4 +11,3 @@ EOF if [ ! "$?" -eq "0" ]; then echo -DKBUILD_NO_NLS; fi - diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c index 7883936..60826e3 100644 --- a/util/kconfig/mconf.c +++ b/util/kconfig/mconf.c @@ -1034,4 +1034,3 @@ int main(int ac, char **av) return res; } - diff --git a/util/kconfig/nconf.c b/util/kconfig/nconf.c index 4fbecd2..984489e 100644 --- a/util/kconfig/nconf.c +++ b/util/kconfig/nconf.c @@ -1554,4 +1554,3 @@ int main(int ac, char **av) endwin(); return 0; } - diff --git a/util/kconfig/util.c b/util/kconfig/util.c index 960747c..1eb2b37 100644 --- a/util/kconfig/util.c +++ b/util/kconfig/util.c @@ -159,5 +159,3 @@ void *xcalloc(size_t nmemb, size_t size) fprintf(stderr, "Out of memory.\n"); exit(1); } - -

1 0

New patch to review for coreboot: 8a7585e kconfig: lxdialog: fix spelling
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9310 -gerrit commit 8a7585e0a770eecce92603387847f6db714014f0 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Apr 6 01:22:36 2015 +0200 kconfig: lxdialog: fix spelling Signed-off-by: Brian Norris <computersforpeace(a)gmail.com> Cc: "Yann E. MORIN" <yann.morin.1998(a)free.fr> Signed-off-by: Michal Marek <mmarek(a)suse.cz> Change-Id: I033338a4a3f3a20944feace46b679c85ee32d14e Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/kconfig/lxdialog/dialog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/kconfig/lxdialog/dialog.h b/util/kconfig/lxdialog/dialog.h index b4343d3..fcffd5b 100644 --- a/util/kconfig/lxdialog/dialog.h +++ b/util/kconfig/lxdialog/dialog.h @@ -170,7 +170,7 @@ char item_tag(void); /* item list manipulation for lxdialog use */ #define MAXITEMSTR 200 struct dialog_item { - char str[MAXITEMSTR]; /* promtp displayed */ + char str[MAXITEMSTR]; /* prompt displayed */ char tag; void *data; /* pointer to menu item - used by menubox+checklist */ int selected; /* Set to 1 by dialog_*() function if selected. */

1 0

New patch to review for coreboot: db80d46 kconfig: use va_end to match corresponding va_start
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9309 -gerrit commit db80d46adcc31fbd44941227bd57dc7ed66e9b97 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Apr 6 01:14:21 2015 +0200 kconfig: use va_end to match corresponding va_start Although on some systems va_end is a no-op, it is good practice to use va_end, especially since the manual states: "Each invocation of va_start() must be matched by a corresponding invocation of va_end() in the same function." Signed-off-by: Colin Ian King <colin.king(a)canonical.com> Signed-off-by: Michal Marek <mmarek(a)suse.cz> Change-Id: Ia08a57c37a6294e002cb6ce4c0a010c0d2edf973 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/kconfig/confdata.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index 149e27a..235debf 100644 --- a/util/kconfig/confdata.c +++ b/util/kconfig/confdata.c @@ -59,6 +59,7 @@ static void conf_message(const char *fmt, ...) va_start(ap, fmt); if (conf_message_callback) conf_message_callback(fmt, ap); + va_end(ap); } const char *conf_get_configname(void)

1 0

New patch to review for coreboot: 874bf2f kbuild: trivial - use tabs for code indent where possible
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9308 -gerrit commit 874bf2f3c0b77a3843f15552492ff32127215fdd Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Mon Apr 6 00:59:23 2015 +0200 kbuild: trivial - use tabs for code indent where possible Imported from upstream linux kernel kconfig. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: Ieed948c6b9c5fc40c1f3d652df11fa70ec6e93a0 Original-Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Original-Signed-off-by: Michal Marek <mmarek(a)suse.cz> --- util/kconfig/conf.c | 2 +- util/kconfig/gconf.c | 2 +- util/kconfig/lxdialog/checklist.c | 4 ++-- util/kconfig/lxdialog/inputbox.c | 2 +- util/kconfig/lxdialog/menubox.c | 4 ++-- util/kconfig/lxdialog/util.c | 2 +- util/kconfig/mconf.c | 2 +- util/kconfig/menu.c | 6 +++--- util/kconfig/zconf.l | 4 ++-- util/kconfig/zconf.lex.c_shipped | 4 ++-- util/kconfig/zconf.tab.c_shipped | 2 +- util/kconfig/zconf.y | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c index d19944f..fef75fc 100644 --- a/util/kconfig/conf.c +++ b/util/kconfig/conf.c @@ -696,7 +696,7 @@ int main(int ac, char **av) } else if (input_mode == savedefconfig) { if (conf_write_defconfig(defconfig_file)) { fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), - defconfig_file); + defconfig_file); return 1; } } else if (input_mode != listnewconfig) { diff --git a/util/kconfig/gconf.c b/util/kconfig/gconf.c index f2bee70..d0a35b2 100644 --- a/util/kconfig/gconf.c +++ b/util/kconfig/gconf.c @@ -1404,7 +1404,7 @@ static void display_tree(struct menu *menu) && (tree == tree2)) continue; /* - if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) + if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) || (view_mode == FULL_VIEW) || (view_mode == SPLIT_VIEW))*/ diff --git a/util/kconfig/lxdialog/checklist.c b/util/kconfig/lxdialog/checklist.c index 3b15c08..8d016fa 100644 --- a/util/kconfig/lxdialog/checklist.c +++ b/util/kconfig/lxdialog/checklist.c @@ -168,13 +168,13 @@ do_resize: /* create new window for the list */ list = subwin(dialog, list_height, list_width, y + box_y + 1, - x + box_x + 1); + x + box_x + 1); keypad(list, TRUE); /* draw a box around the list items */ draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2, - dlg.menubox_border.atr, dlg.menubox.atr); + dlg.menubox_border.atr, dlg.menubox.atr); /* Find length of longest item in order to center checklist */ check_x = 0; diff --git a/util/kconfig/lxdialog/inputbox.c b/util/kconfig/lxdialog/inputbox.c index 447a582..d58de1d 100644 --- a/util/kconfig/lxdialog/inputbox.c +++ b/util/kconfig/lxdialog/inputbox.c @@ -42,7 +42,7 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected) * Display a dialog box for inputing a string */ int dialog_inputbox(const char *title, const char *prompt, int height, int width, - const char *init) + const char *init) { int i, x, y, box_y, box_x, box_width; int input_x = 0, key = 0, button = -1; diff --git a/util/kconfig/lxdialog/menubox.c b/util/kconfig/lxdialog/menubox.c index c93de0b..11ae9ad 100644 --- a/util/kconfig/lxdialog/menubox.c +++ b/util/kconfig/lxdialog/menubox.c @@ -64,7 +64,7 @@ static int menu_width, item_x; * Print menu item */ static void do_print_item(WINDOW * win, const char *item, int line_y, - int selected, int hotkey) + int selected, int hotkey) { int j; char *menu_item = malloc(menu_width + 1); @@ -182,7 +182,7 @@ static void do_scroll(WINDOW *win, int *scroll, int n) * Display a menu for choosing among a number of options */ int dialog_menu(const char *title, const char *prompt, - const void *selected, int *s_scroll) + const void *selected, int *s_scroll) { int i, j, x, y, box_x, box_y; int height, width, menu_height; diff --git a/util/kconfig/lxdialog/util.c b/util/kconfig/lxdialog/util.c index 58a8289..f7abdeb 100644 --- a/util/kconfig/lxdialog/util.c +++ b/util/kconfig/lxdialog/util.c @@ -623,7 +623,7 @@ void item_make(const char *fmt, ...) void item_add_str(const char *fmt, ...) { va_list ap; - size_t avail; + size_t avail; avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str); diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c index 8d299b8..7883936 100644 --- a/util/kconfig/mconf.c +++ b/util/kconfig/mconf.c @@ -299,7 +299,7 @@ static void set_config_filename(const char *config_filename) int size; size = snprintf(menu_backtitle, sizeof(menu_backtitle), - "%s - %s", config_filename, rootmenu.prompt->text); + "%s - %s", config_filename, rootmenu.prompt->text); if (size >= sizeof(menu_backtitle)) menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; set_dialog_backtitle(menu_backtitle); diff --git a/util/kconfig/menu.c b/util/kconfig/menu.c index 3ac2c9c..a26cc5d 100644 --- a/util/kconfig/menu.c +++ b/util/kconfig/menu.c @@ -258,8 +258,8 @@ static void sym_check_prop(struct symbol *sym) "config symbol '%s' uses select, but is " "not boolean or tristate", sym->name); else if (sym2->type != S_UNKNOWN && - sym2->type != S_BOOLEAN && - sym2->type != S_TRISTATE) + sym2->type != S_BOOLEAN && + sym2->type != S_TRISTATE) prop_warn(prop, "'%s' has wrong type. 'select' only " "accept arguments of boolean and " @@ -268,7 +268,7 @@ static void sym_check_prop(struct symbol *sym) case P_RANGE: if (sym->type != S_INT && sym->type != S_HEX) prop_warn(prop, "range is only allowed " - "for int or hex symbols"); + "for int or hex symbols"); if (!menu_validate_number(sym, prop->expr->left.sym) || !menu_validate_number(sym, prop->expr->right.sym)) prop_warn(prop, "range is invalid"); diff --git a/util/kconfig/zconf.l b/util/kconfig/zconf.l index 1a9f53e..6c62d93 100644 --- a/util/kconfig/zconf.l +++ b/util/kconfig/zconf.l @@ -27,8 +27,8 @@ static char *text; static int text_size, text_asize; struct buffer { - struct buffer *parent; - YY_BUFFER_STATE state; + struct buffer *parent; + YY_BUFFER_STATE state; }; struct buffer *current_buf; diff --git a/util/kconfig/zconf.lex.c_shipped b/util/kconfig/zconf.lex.c_shipped index a0521aa..349a7f2 100644 --- a/util/kconfig/zconf.lex.c_shipped +++ b/util/kconfig/zconf.lex.c_shipped @@ -789,8 +789,8 @@ static char *text; static int text_size, text_asize; struct buffer { - struct buffer *parent; - YY_BUFFER_STATE state; + struct buffer *parent; + YY_BUFFER_STATE state; }; struct buffer *current_buf; diff --git a/util/kconfig/zconf.tab.c_shipped b/util/kconfig/zconf.tab.c_shipped index 25ae16a..de5e84e 100644 --- a/util/kconfig/zconf.tab.c_shipped +++ b/util/kconfig/zconf.tab.c_shipped @@ -2314,7 +2314,7 @@ void conf_parse(const char *name) for_all_symbols(i, sym) { if (sym_check_deps(sym)) zconfnerrs++; - } + } if (zconfnerrs) exit(1); sym_set_change_count(1); diff --git a/util/kconfig/zconf.y b/util/kconfig/zconf.y index 0653886..0f683cf 100644 --- a/util/kconfig/zconf.y +++ b/util/kconfig/zconf.y @@ -510,7 +510,7 @@ void conf_parse(const char *name) for_all_symbols(i, sym) { if (sym_check_deps(sym)) zconfnerrs++; - } + } if (zconfnerrs) exit(1); sym_set_change_count(1);

1 0

New patch to review for coreboot: bfe1b41 nvramtool: fix getopt handling with unsigned char
by Stefan Tauner 05 Apr '15

05 Apr '15

Stefan Tauner (stefan.tauner(a)gmx.at) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9307 -gerrit commit bfe1b412784225ed561e84421cd597959810bf59 Author: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Date: Sun Apr 5 23:13:53 2015 +0200 nvramtool: fix getopt handling with unsigned char make failed while "OPTION option_table.h" by printing nvramtool's usage message when crosscompiling coreboot on the BBB. The reason is the usage of char for the return value of getopt instead of int and comparing it to -1... while char might be unsigned as it apparently is on ARM/the BBB(?). Change-Id: Ib20fd5ef174d484bbb35f80150b8f898d95d0fe4 Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> --- util/nvramtool/cli/opts.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c index 8e920e8..a128c0b 100644 --- a/util/nvramtool/cli/opts.c +++ b/util/nvramtool/cli/opts.c @@ -51,8 +51,7 @@ static const char getopt_string[] = "-ab:B:c::C:dD:e:hH:iL:l::np:r:tvw:xX:y:Y"; void parse_nvramtool_args(int argc, char *argv[]) { nvramtool_op_modifier_info_t *mod_info; - int i, op_found; - char c; + int i, op_found, c; for (i = 0, mod_info = nvramtool_op_modifiers; i < NVRAMTOOL_NUM_OP_MODIFIERS; i++, mod_info++) {

1 0

Patch set updated for coreboot: bedc5a1 git: add rebase helper script
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9299 -gerrit commit bedc5a115f0130198207421008d912cc1b4a1a64 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Fri Apr 3 17:06:48 2015 -0700 git: add rebase helper script This is a script we have been using to rewrite commit messages when upstreaming coreboot patches from the ChromiumOS tree into coreboot upstream. Change-Id: I5442279c099dafe55cc97ccf09ee2bc2df4eca5f Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/gitconfig/rebase.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/util/gitconfig/rebase.sh b/util/gitconfig/rebase.sh new file mode 100755 index 0000000..4bc32a4 --- /dev/null +++ b/util/gitconfig/rebase.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +# rebase.sh - rebase helper script +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +# Adapt to your remote branch: +BRANCH="cros/chromeos-2013.04" + +# When pulling in patches from another tree from a gerrit repository, +# do the following at the end of a larger cherry-pick series: +# git remote add ... +# git checkout -b upstreaming +# git cherry-pick ... +# git rebase -i --exec util/gitconfig/rebase.sh master +# Alternatively, you can run util/gitconfig/rebase.sh after every +# individual cherry-pick. + +commit_message() { + git log -n 1 | grep "^ " | cut -c5- +} + +CHID=$( commit_message | grep -i "^Change-Id: I" ) +CID=$( git log -n1 --grep "^$CHID$" --pretty=%H $BRANCH ) +GUID="$(git config user.name) <$(git config user.email)>" + +# TBD: Don't add Original- to empty lines, and possibly make script more +# solid for commits with an unexpected order of meta data lines. + +commit_message | tac | awk '/^$/ { + if (end==0) + print "Original-Commit-Id: '"$CID"'\nSigned-off-by: '"$GUID"'"; + end=1 + }; { + if (end==0) + print "Original-" $0; + else + print $0; + }' | tac | git commit --amend -F -

1 0

Patch set updated for coreboot: 98d02da git: add rebase helper script
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9299 -gerrit commit 98d02daf607780ce06c28ee8bcd78bc49f1ff567 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Fri Apr 3 17:06:48 2015 -0700 git: add rebase helper script This is a script we have been using to rewrite commit messages when upstreaming coreboot patches from the ChromiumOS tree into coreboot upstream. Change-Id: I5442279c099dafe55cc97ccf09ee2bc2df4eca5f Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/gitconfig/rebase.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/util/gitconfig/rebase.sh b/util/gitconfig/rebase.sh new file mode 100755 index 0000000..0229308 --- /dev/null +++ b/util/gitconfig/rebase.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +# rebase.sh - rebase helper script +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +# Adapt to youre remote branch: +BRANCH="cros/chromeos-2013.04" + +# When pulling in patches from another tree from a gerrit repository, +# do the following at the end of a larger cherry-pick series: +# git remote add ... +# git checkout -b upstreaming +# git cherry-pick ... +# git rebase -i --exec util/gitconfig/rebase.sh master +# Alternatively, you can run util/gitconfig/rebase.sh after every +# individual cherry-pick. + +commit_message() { + git log -n 1 | grep "^ " | cut -c5- +} + +CHID=$( commit_message | grep -i "^Change-Id: I" ) +CID=$( git log -n1 --grep "^$CHID$" --pretty=%H $BRANCH ) +GUID="$(git config user.name) <$(git config user.email)>" + +# TBD: Don't add Original- to empty lines, and possibly make script more +# solid for commits with an unexpected order of meta data lines. + +commit_message | tac | awk '/^$/ { + if (end==0) + print "Original-Commit-Id: '"$CID"'\nSigned-off-by: '"$GUID"'"; + end=1 + }; { + if (end==0) + print "Original-" $0; + else + print $0; + }' | tac | git commit --amend -F -

1 0

Patch set updated for coreboot: b9cd8a4 kconfig: drop intermittend forwarder files
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9298 -gerrit commit b9cd8a4558bdc83941e09100d19f7b3c3f3dc3b3 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Apr 4 01:58:28 2015 +0200 kconfig: drop intermittend forwarder files With kconfig understanding wildcards, we don't need Kconfig files that just include other Kconfig files anymore. Change-Id: I7584e675f78fcb4ff1fdb0731e340533c5bc040d Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- src/Kconfig | 55 ++++++++++----------------------------- src/arch/arm/Kconfig | 4 +++ src/arch/arm64/Kconfig | 4 +++ src/arch/mips/Kconfig | 4 +++ src/arch/riscv/Kconfig | 4 +++ src/arch/x86/Kconfig | 5 ++++ src/cpu/Kconfig | 12 +-------- src/cpu/x86/Kconfig | 4 --- src/drivers/Kconfig | 45 -------------------------------- src/drivers/pc80/Kconfig | 4 +++ src/drivers/ricoh/Kconfig | 1 + src/ec/Kconfig | 7 ----- src/ec/compal/Kconfig | 1 - src/ec/google/Kconfig | 1 - src/ec/kontron/Kconfig | 1 - src/ec/lenovo/Kconfig | 2 -- src/ec/quanta/Kconfig | 2 -- src/ec/smsc/Kconfig | 1 - src/northbridge/Kconfig | 5 ---- src/northbridge/amd/Kconfig | 7 ----- src/northbridge/amd/agesa/Kconfig | 8 +----- src/northbridge/dmp/Kconfig | 20 -------------- src/northbridge/intel/Kconfig | 17 ------------ src/northbridge/rdc/Kconfig | 1 - src/northbridge/via/Kconfig | 4 --- src/soc/Kconfig | 7 ----- src/soc/imgtec/Kconfig | 1 - src/soc/intel/Kconfig | 4 --- src/soc/nvidia/Kconfig | 2 -- src/soc/qualcomm/Kconfig | 9 ------- src/soc/qualcomm/ipq806x/Kconfig | 8 ++++++ src/soc/rockchip/Kconfig | 20 -------------- src/soc/samsung/Kconfig | 2 -- src/soc/ucb/Kconfig | 1 - src/southbridge/Kconfig | 10 ------- src/southbridge/amd/Kconfig | 15 ----------- src/southbridge/broadcom/Kconfig | 3 --- src/southbridge/dmp/Kconfig | 20 -------------- src/southbridge/intel/Kconfig | 18 ------------- src/southbridge/nvidia/Kconfig | 2 -- src/southbridge/rdc/Kconfig | 1 - src/southbridge/ricoh/Kconfig | 1 - src/southbridge/sis/Kconfig | 1 - src/southbridge/ti/Kconfig | 22 ---------------- src/southbridge/via/Kconfig | 2 -- src/superio/Kconfig | 32 ----------------------- src/superio/smsc/Kconfig | 3 +++ 47 files changed, 53 insertions(+), 350 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index aa4d6ee..cc87aec 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -255,39 +255,11 @@ config UPDATE_IMAGE endmenu -source src/mainboard/Kconfig +source "src/mainboard/Kconfig" -# This option is used to set the architecture of a mainboard to X86. -# It is usually set in mainboard/*/Kconfig. -config ARCH_X86 - bool - default n - select PCI - -config ARCH_ARM - bool - default n - -config ARCH_ARM64 - bool - default n - -config ARCH_RISCV - bool - default n - select ANY_TOOLCHAIN - -config ARCH_MIPS - bool - default n - -source src/arch/x86/Kconfig -source src/arch/arm/Kconfig -source src/arch/arm64/Kconfig -source src/arch/riscv/Kconfig -source src/arch/mips/Kconfig +source "src/arch/*/Kconfig" -source src/vendorcode/Kconfig +source "src/vendorcode/*/Kconfig" config SYSTEM_TYPE_LAPTOP default n @@ -296,18 +268,19 @@ config SYSTEM_TYPE_LAPTOP menu "Chipset" comment "CPU" -source src/cpu/Kconfig +source "src/cpu/Kconfig" comment "Northbridge" -source src/northbridge/Kconfig +source "src/northbridge/*/*/Kconfig" comment "Southbridge" -source src/southbridge/Kconfig +source "src/southbridge/*/*/Kconfig" comment "Super I/O" -source src/superio/Kconfig +source "src/superio/*/Kconfig" comment "Embedded Controllers" -source src/ec/Kconfig +source "src/ec/acpi/Kconfig" +source "src/ec/*/*/Kconfig" comment "SoC" -source src/soc/Kconfig -source src/drivers/intel/fsp/Kconfig +source "src/soc/*/*/Kconfig" +source "src/drivers/intel/fsp/Kconfig" endmenu @@ -319,10 +292,10 @@ config MAINBOARD_HAS_BOOTBLOCK_INIT bool default n -source src/device/Kconfig +source "src/device/Kconfig" menu "Generic Drivers" -source src/drivers/Kconfig +source "src/drivers/*/Kconfig" endmenu config TPM @@ -365,7 +338,7 @@ config BOOTMODE_STRAPS bool default n -source src/console/Kconfig +source "src/console/Kconfig" config HAVE_ACPI_RESUME bool diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig index 77ed41a..2499d2d 100644 --- a/src/arch/arm/Kconfig +++ b/src/arch/arm/Kconfig @@ -1,3 +1,7 @@ +config ARCH_ARM + bool + default n + config ARCH_BOOTBLOCK_ARM bool default n diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig index 16830bc..47e7b67 100644 --- a/src/arch/arm64/Kconfig +++ b/src/arch/arm64/Kconfig @@ -1,3 +1,7 @@ +config ARCH_ARM64 + bool + default n + config ARCH_BOOTBLOCK_ARM64 bool default n diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig index 5c0fc5c..10349f2 100644 --- a/src/arch/mips/Kconfig +++ b/src/arch/mips/Kconfig @@ -19,6 +19,10 @@ # MA 02110-1301 USA # +config ARCH_MIPS + bool + default n + config ARCH_BOOTBLOCK_MIPS bool default n diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index f2dc41e..5d7b5c2 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -1,3 +1,7 @@ +config ARCH_RISCV + bool + default n + config ARCH_BOOTBLOCK_RISCV bool default n diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 93474a8..f7da89a 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -13,6 +13,11 @@ ## GNU General Public License for more details. ## +config ARCH_X86 + bool + default n + select PCI + config ARCH_BOOTBLOCK_X86_32 bool default n diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index f6f0647..c8dc136 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -2,17 +2,7 @@ # The if controls how the evaluation occurs. # (See also src/Kconfig) -source src/cpu/allwinner/Kconfig -source src/cpu/armltd/Kconfig -source src/cpu/ti/Kconfig - -source src/cpu/amd/Kconfig -source src/cpu/dmp/Kconfig -source src/cpu/intel/Kconfig -source src/cpu/mips/Kconfig -source src/cpu/via/Kconfig -source src/cpu/qemu-x86/Kconfig -source src/cpu/x86/Kconfig +source "src/cpu/*/Kconfig" if ARCH_X86 diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 1e15166..41c2288 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -80,10 +80,6 @@ config SMM_TSEG bool default n -config SMM_TSEG_SIZE - hex - default 0 - config SMM_MODULES bool default n diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig deleted file mode 100644 index 435ed0e..0000000 --- a/src/drivers/Kconfig +++ /dev/null @@ -1,45 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2010 Rudolf Marek <r.marek(a)assembler.cz> -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -source src/drivers/ams/Kconfig -source src/drivers/ati/Kconfig -source src/drivers/dec/Kconfig -source src/drivers/elog/Kconfig -source src/drivers/emulation/Kconfig -source src/drivers/generic/Kconfig -source src/drivers/gic/Kconfig -source src/drivers/i2c/Kconfig -source src/drivers/ics/Kconfig -source src/drivers/intel/Kconfig -source src/drivers/ipmi/Kconfig -source src/drivers/lenovo/Kconfig -source src/drivers/maxim/Kconfig -source src/drivers/parade/Kconfig -if PC80_SYSTEM -source src/drivers/pc80/Kconfig -endif -source src/drivers/sil/Kconfig -source src/drivers/spi/Kconfig -source src/drivers/ti/Kconfig -source src/drivers/trident/Kconfig -source src/drivers/uart/Kconfig -source src/drivers/usb/Kconfig -source src/drivers/xgi/Kconfig -source src/drivers/xpowers/Kconfig -source src/drivers/ricoh/rce822/Kconfig diff --git a/src/drivers/pc80/Kconfig b/src/drivers/pc80/Kconfig index f8ac5c5..f6da88c 100644 --- a/src/drivers/pc80/Kconfig +++ b/src/drivers/pc80/Kconfig @@ -1,5 +1,7 @@ # Might be removed (alongside with the PS/2 init code) once payloads # reliably support PS/2 init themselves. +if PC80_SYSTEM + config DRIVERS_PS2_KEYBOARD bool "PS/2 keyboard init" default y @@ -26,3 +28,5 @@ config LPC_TPM config DRIVERS_MC146818 bool default y if ARCH_X86 + +endif diff --git a/src/drivers/ricoh/Kconfig b/src/drivers/ricoh/Kconfig new file mode 100644 index 0000000..6b05142 --- /dev/null +++ b/src/drivers/ricoh/Kconfig @@ -0,0 +1 @@ +source src/drivers/ricoh/rce822/Kconfig diff --git a/src/ec/Kconfig b/src/ec/Kconfig deleted file mode 100644 index 98aeb9c..0000000 --- a/src/ec/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -source src/ec/acpi/Kconfig -source src/ec/compal/Kconfig -source src/ec/google/Kconfig -source src/ec/kontron/Kconfig -source src/ec/lenovo/Kconfig -source src/ec/smsc/Kconfig -source src/ec/quanta/Kconfig diff --git a/src/ec/compal/Kconfig b/src/ec/compal/Kconfig deleted file mode 100644 index 5b7899a..0000000 --- a/src/ec/compal/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/ec/compal/ene932/Kconfig diff --git a/src/ec/google/Kconfig b/src/ec/google/Kconfig deleted file mode 100644 index f83741e..0000000 --- a/src/ec/google/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/ec/google/chromeec/Kconfig diff --git a/src/ec/kontron/Kconfig b/src/ec/kontron/Kconfig deleted file mode 100644 index 747a667..0000000 --- a/src/ec/kontron/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/ec/kontron/it8516e/Kconfig diff --git a/src/ec/lenovo/Kconfig b/src/ec/lenovo/Kconfig deleted file mode 100644 index 73f11ca..0000000 --- a/src/ec/lenovo/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/ec/lenovo/h8/Kconfig -source src/ec/lenovo/pmh7/Kconfig diff --git a/src/ec/quanta/Kconfig b/src/ec/quanta/Kconfig deleted file mode 100644 index 00c3dbf..0000000 --- a/src/ec/quanta/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/ec/quanta/ene_kb3940q/Kconfig -source src/ec/quanta/it8518/Kconfig diff --git a/src/ec/smsc/Kconfig b/src/ec/smsc/Kconfig deleted file mode 100644 index afc6e4b..0000000 --- a/src/ec/smsc/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/ec/smsc/mec1308/Kconfig diff --git a/src/northbridge/Kconfig b/src/northbridge/Kconfig deleted file mode 100644 index 0ac09a6..0000000 --- a/src/northbridge/Kconfig +++ /dev/null @@ -1,5 +0,0 @@ -source src/northbridge/amd/Kconfig -source src/northbridge/dmp/Kconfig -source src/northbridge/intel/Kconfig -source src/northbridge/rdc/Kconfig -source src/northbridge/via/Kconfig diff --git a/src/northbridge/amd/Kconfig b/src/northbridge/amd/Kconfig deleted file mode 100644 index 4bc6e49..0000000 --- a/src/northbridge/amd/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -source src/northbridge/amd/amdk8/Kconfig -source src/northbridge/amd/gx2/Kconfig -source src/northbridge/amd/amdfam10/Kconfig -source src/northbridge/amd/lx/Kconfig -source src/northbridge/amd/agesa/Kconfig -source src/northbridge/amd/cimx/Kconfig -source src/northbridge/amd/pi/Kconfig \ No newline at end of file diff --git a/src/northbridge/amd/agesa/Kconfig b/src/northbridge/amd/agesa/Kconfig index 8fd8bfd..430d4ba 100644 --- a/src/northbridge/amd/agesa/Kconfig +++ b/src/northbridge/amd/agesa/Kconfig @@ -32,13 +32,7 @@ config S3_VGA_ROM_RUN bool default n -source src/northbridge/amd/agesa/family10/Kconfig -source src/northbridge/amd/agesa/family12/Kconfig -source src/northbridge/amd/agesa/family14/Kconfig -source src/northbridge/amd/agesa/family15/Kconfig -source src/northbridge/amd/agesa/family15tn/Kconfig -source src/northbridge/amd/agesa/family15rl/Kconfig -source src/northbridge/amd/agesa/family16kb/Kconfig +source "src/northbridge/amd/agesa/*/Kconfig" # TODO: Reservation for heap seems excessive config HEAP_SIZE diff --git a/src/northbridge/dmp/Kconfig b/src/northbridge/dmp/Kconfig deleted file mode 100644 index a69d1d9..0000000 --- a/src/northbridge/dmp/Kconfig +++ /dev/null @@ -1,20 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2013 DMP Electronics Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -source src/northbridge/dmp/vortex86ex/Kconfig diff --git a/src/northbridge/intel/Kconfig b/src/northbridge/intel/Kconfig deleted file mode 100644 index cf7264b..0000000 --- a/src/northbridge/intel/Kconfig +++ /dev/null @@ -1,17 +0,0 @@ -source src/northbridge/intel/e7501/Kconfig -source src/northbridge/intel/e7505/Kconfig -source src/northbridge/intel/i3100/Kconfig -source src/northbridge/intel/i440bx/Kconfig -source src/northbridge/intel/i440lx/Kconfig -source src/northbridge/intel/i82810/Kconfig -source src/northbridge/intel/i82830/Kconfig -source src/northbridge/intel/i855/Kconfig -source src/northbridge/intel/i945/Kconfig -source src/northbridge/intel/gm45/Kconfig -source src/northbridge/intel/sch/Kconfig -source src/northbridge/intel/i5000/Kconfig -source src/northbridge/intel/nehalem/Kconfig -source src/northbridge/intel/sandybridge/Kconfig -source src/northbridge/intel/haswell/Kconfig -source src/northbridge/intel/fsp_sandybridge/Kconfig -source src/northbridge/intel/fsp_rangeley/Kconfig diff --git a/src/northbridge/rdc/Kconfig b/src/northbridge/rdc/Kconfig deleted file mode 100644 index 73ac740..0000000 --- a/src/northbridge/rdc/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/northbridge/rdc/r8610/Kconfig diff --git a/src/northbridge/via/Kconfig b/src/northbridge/via/Kconfig deleted file mode 100644 index 7b9fa1d..0000000 --- a/src/northbridge/via/Kconfig +++ /dev/null @@ -1,4 +0,0 @@ -source src/northbridge/via/cn700/Kconfig -source src/northbridge/via/cx700/Kconfig -source src/northbridge/via/vx800/Kconfig -source src/northbridge/via/vx900/Kconfig diff --git a/src/soc/Kconfig b/src/soc/Kconfig deleted file mode 100644 index 43c2010..0000000 --- a/src/soc/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -source src/soc/imgtec/Kconfig -source src/soc/intel/Kconfig -source src/soc/nvidia/Kconfig -source src/soc/qualcomm/Kconfig -source src/soc/rockchip/Kconfig -source src/soc/samsung/Kconfig -source src/soc/ucb/Kconfig diff --git a/src/soc/imgtec/Kconfig b/src/soc/imgtec/Kconfig deleted file mode 100644 index df51850..0000000 --- a/src/soc/imgtec/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/soc/imgtec/pistachio/Kconfig diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig deleted file mode 100644 index 808f6b8..0000000 --- a/src/soc/intel/Kconfig +++ /dev/null @@ -1,4 +0,0 @@ -source src/soc/intel/baytrail/Kconfig -source src/soc/intel/broadwell/Kconfig -source src/soc/intel/fsp_baytrail/Kconfig -source src/soc/intel/common/Kconfig diff --git a/src/soc/nvidia/Kconfig b/src/soc/nvidia/Kconfig deleted file mode 100644 index cb1f468..0000000 --- a/src/soc/nvidia/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/soc/nvidia/tegra124/Kconfig -source src/soc/nvidia/tegra132/Kconfig diff --git a/src/soc/qualcomm/Kconfig b/src/soc/qualcomm/Kconfig deleted file mode 100644 index 918093b..0000000 --- a/src/soc/qualcomm/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -source src/soc/qualcomm/ipq806x/Kconfig - -config CBFS_SIZE - hex "Size of CBFS filesystem in ROM" - default ROM_SIZE - help - CBFS size needs to match the size of memory allocated to the - coreboot blob elsewhere in the system. Make sure this config option - is fine tuned in the board config file. diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 013d86c..35310fe 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -13,6 +13,14 @@ config SOC_QC_IPQ806X if SOC_QC_IPQ806X +config CBFS_SIZE + hex "Size of CBFS filesystem in ROM" + default ROM_SIZE + help + CBFS size needs to match the size of memory allocated to the + coreboot blob elsewhere in the system. Make sure this config option + is fine tuned in the board config file. + config BOOTBLOCK_ROM_OFFSET hex default 0x0 diff --git a/src/soc/rockchip/Kconfig b/src/soc/rockchip/Kconfig deleted file mode 100644 index b041f89..0000000 --- a/src/soc/rockchip/Kconfig +++ /dev/null @@ -1,20 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2014 Rockchip Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -source src/soc/rockchip/rk3288/Kconfig diff --git a/src/soc/samsung/Kconfig b/src/soc/samsung/Kconfig deleted file mode 100644 index 9241d27..0000000 --- a/src/soc/samsung/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/soc/samsung/exynos5250/Kconfig -source src/soc/samsung/exynos5420/Kconfig diff --git a/src/soc/ucb/Kconfig b/src/soc/ucb/Kconfig deleted file mode 100644 index 7af50cb..0000000 --- a/src/soc/ucb/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/soc/ucb/riscv/Kconfig diff --git a/src/southbridge/Kconfig b/src/southbridge/Kconfig deleted file mode 100644 index 84b5f8d..0000000 --- a/src/southbridge/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -source src/southbridge/amd/Kconfig -source src/southbridge/broadcom/Kconfig -source src/southbridge/dmp/Kconfig -source src/southbridge/intel/Kconfig -source src/southbridge/nvidia/Kconfig -source src/southbridge/rdc/Kconfig -source src/southbridge/ricoh/Kconfig -source src/southbridge/sis/Kconfig -source src/southbridge/ti/Kconfig -source src/southbridge/via/Kconfig diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig deleted file mode 100644 index feb9006..0000000 --- a/src/southbridge/amd/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -source src/southbridge/amd/amd8111/Kconfig -source src/southbridge/amd/amd8131/Kconfig -source src/southbridge/amd/cs5536/Kconfig -source src/southbridge/amd/amd8132/Kconfig -source src/southbridge/amd/amd8151/Kconfig -source src/southbridge/amd/cs5535/Kconfig -source src/southbridge/amd/rs690/Kconfig -source src/southbridge/amd/sb600/Kconfig -source src/southbridge/amd/rs780/Kconfig -source src/southbridge/amd/sb700/Kconfig -source src/southbridge/amd/sb800/Kconfig -source src/southbridge/amd/cimx/Kconfig -source src/southbridge/amd/agesa/Kconfig -source src/southbridge/amd/pi/Kconfig -source src/southbridge/amd/sr5650/Kconfig diff --git a/src/southbridge/broadcom/Kconfig b/src/southbridge/broadcom/Kconfig deleted file mode 100644 index 38ff222..0000000 --- a/src/southbridge/broadcom/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -source src/southbridge/broadcom/bcm21000/Kconfig -source src/southbridge/broadcom/bcm5780/Kconfig -source src/southbridge/broadcom/bcm5785/Kconfig diff --git a/src/southbridge/dmp/Kconfig b/src/southbridge/dmp/Kconfig deleted file mode 100644 index 1c5b8c7..0000000 --- a/src/southbridge/dmp/Kconfig +++ /dev/null @@ -1,20 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2013 DMP Electronics Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -source src/southbridge/dmp/vortex86ex/Kconfig diff --git a/src/southbridge/intel/Kconfig b/src/southbridge/intel/Kconfig deleted file mode 100644 index 426ac0b..0000000 --- a/src/southbridge/intel/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -source src/southbridge/intel/common/Kconfig -source src/southbridge/intel/esb6300/Kconfig -source src/southbridge/intel/i3100/Kconfig -source src/southbridge/intel/i82371eb/Kconfig -source src/southbridge/intel/i82801ax/Kconfig -source src/southbridge/intel/i82801bx/Kconfig -source src/southbridge/intel/i82801cx/Kconfig -source src/southbridge/intel/i82801dx/Kconfig -source src/southbridge/intel/i82801ex/Kconfig -source src/southbridge/intel/i82801gx/Kconfig -source src/southbridge/intel/i82801ix/Kconfig -source src/southbridge/intel/i82870/Kconfig -source src/southbridge/intel/sch/Kconfig -source src/southbridge/intel/bd82x6x/Kconfig -source src/southbridge/intel/ibexpeak/Kconfig -source src/southbridge/intel/lynxpoint/Kconfig -source src/southbridge/intel/fsp_bd82x6x/Kconfig -source src/southbridge/intel/fsp_rangeley/Kconfig diff --git a/src/southbridge/nvidia/Kconfig b/src/southbridge/nvidia/Kconfig deleted file mode 100644 index 59fc8ed..0000000 --- a/src/southbridge/nvidia/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/southbridge/nvidia/ck804/Kconfig -source src/southbridge/nvidia/mcp55/Kconfig diff --git a/src/southbridge/rdc/Kconfig b/src/southbridge/rdc/Kconfig deleted file mode 100644 index 50ef475..0000000 --- a/src/southbridge/rdc/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/southbridge/rdc/r8610/Kconfig diff --git a/src/southbridge/ricoh/Kconfig b/src/southbridge/ricoh/Kconfig deleted file mode 100644 index 2d25e9e..0000000 --- a/src/southbridge/ricoh/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/southbridge/ricoh/rl5c476/Kconfig diff --git a/src/southbridge/sis/Kconfig b/src/southbridge/sis/Kconfig deleted file mode 100644 index 4d11384..0000000 --- a/src/southbridge/sis/Kconfig +++ /dev/null @@ -1 +0,0 @@ -source src/southbridge/sis/sis966/Kconfig diff --git a/src/southbridge/ti/Kconfig b/src/southbridge/ti/Kconfig deleted file mode 100644 index 7092685..0000000 --- a/src/southbridge/ti/Kconfig +++ /dev/null @@ -1,22 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2008-2009 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -source src/southbridge/ti/pci7420/Kconfig -source src/southbridge/ti/pcixx12/Kconfig -source src/southbridge/ti/pci1x2x/Kconfig diff --git a/src/southbridge/via/Kconfig b/src/southbridge/via/Kconfig deleted file mode 100644 index 75a1395..0000000 --- a/src/southbridge/via/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/southbridge/via/k8t890/Kconfig -source src/southbridge/via/vt8237r/Kconfig diff --git a/src/superio/Kconfig b/src/superio/Kconfig deleted file mode 100644 index 32e60bb..0000000 --- a/src/superio/Kconfig +++ /dev/null @@ -1,32 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Ronald G. Minnich -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -config SUPERIO_WANTS_14MHZ_CLOCK - bool - -source src/superio/fintek/Kconfig -source src/superio/intel/Kconfig -source src/superio/ite/Kconfig -source src/superio/nsc/Kconfig -source src/superio/nuvoton/Kconfig -source src/superio/renesas/Kconfig -source src/superio/serverengines/Kconfig -source src/superio/smsc/Kconfig -source src/superio/via/Kconfig -source src/superio/winbond/Kconfig diff --git a/src/superio/smsc/Kconfig b/src/superio/smsc/Kconfig index 34bc60c..7a58cbb 100644 --- a/src/superio/smsc/Kconfig +++ b/src/superio/smsc/Kconfig @@ -18,6 +18,9 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +config SUPERIO_WANTS_14MHZ_CLOCK + bool + config SUPERIO_SMSC_FDC37M60X bool config SUPERIO_SMSC_FDC37N972

1 0

Patch set updated for coreboot: c9cf3f0 kconfig: automatically include mainboards
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9295 -gerrit commit c9cf3f08facfb4e0f7244185890bce3114a0a700 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Fri Apr 3 20:11:13 2015 +0200 kconfig: automatically include mainboards This is an unfinished example that shows how vendor and mainboard directories could be "drop in", e.g. be placed in coreboot without having to modify any higher level coreboot files. DO NOT COMMIT! This is only a demonstration of what's possible. If we decide to go down this road, there is a lot more to do. Change-Id: Ib68ce1478a2e12562aeac6297128a21eb174d58a Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- src/mainboard/Kconfig | 197 +------------------------ src/mainboard/a-trend/Kconfig.name | 2 + src/mainboard/aaeon/Kconfig.name | 2 + src/mainboard/abit/Kconfig.name | 2 + src/mainboard/adlink/Kconfig.name | 2 + src/mainboard/advansus/Kconfig.name | 2 + src/mainboard/amd/Kconfig.name | 2 + src/mainboard/aopen/Kconfig.name | 2 + src/mainboard/apple/Kconfig.name | 2 + src/mainboard/arima/Kconfig.name | 2 + src/mainboard/artecgroup/Kconfig.name | 2 + src/mainboard/asrock/Kconfig.name | 2 + src/mainboard/asus/Kconfig.name | 2 + src/mainboard/avalue/Kconfig.name | 2 + src/mainboard/azza/Kconfig.name | 2 + src/mainboard/bachmann/Kconfig.name | 2 + src/mainboard/bcom/Kconfig.name | 2 + src/mainboard/bifferos/Kconfig.name | 2 + src/mainboard/biostar/Kconfig.name | 2 + src/mainboard/broadcom/Kconfig.name | 2 + src/mainboard/compaq/Kconfig.name | 2 + src/mainboard/cubietech/Kconfig.name | 2 + src/mainboard/digitallogic/Kconfig.name | 2 + src/mainboard/dmp/Kconfig.name | 2 + src/mainboard/ecs/Kconfig.name | 2 + src/mainboard/emulation/Kconfig.name | 2 + src/mainboard/getac/Kconfig.name | 2 + src/mainboard/gigabyte/Kconfig.name | 2 + src/mainboard/gizmosphere/Kconfig.name | 2 + src/mainboard/google/Kconfig | 65 +------- src/mainboard/google/Kconfig.name | 2 + src/mainboard/google/bolt/Kconfig.name | 2 + src/mainboard/google/butterfly/Kconfig.name | 2 + src/mainboard/google/daisy/Kconfig.name | 2 + src/mainboard/google/falco/Kconfig.name | 2 + src/mainboard/google/link/Kconfig.name | 2 + src/mainboard/google/nyan/Kconfig.name | 2 + src/mainboard/google/nyan_big/Kconfig.name | 2 + src/mainboard/google/nyan_blaze/Kconfig.name | 2 + src/mainboard/google/panther/Kconfig.name | 2 + src/mainboard/google/parrot/Kconfig.name | 2 + src/mainboard/google/peach_pit/Kconfig.name | 2 + src/mainboard/google/peppy/Kconfig.name | 2 + src/mainboard/google/rambi/Kconfig.name | 2 + src/mainboard/google/rush/Kconfig.name | 2 + src/mainboard/google/rush_ryu/Kconfig.name | 2 + src/mainboard/google/samus/Kconfig.name | 2 + src/mainboard/google/slippy/Kconfig.name | 2 + src/mainboard/google/storm/Kconfig.name | 2 + src/mainboard/google/stout/Kconfig.name | 2 + src/mainboard/google/urara/Kconfig.name | 2 + src/mainboard/google/veyron_pinky/Kconfig.name | 2 + src/mainboard/hp/Kconfig.name | 2 + src/mainboard/ibase/Kconfig.name | 2 + src/mainboard/ibm/Kconfig.name | 2 + src/mainboard/iei/Kconfig.name | 2 + src/mainboard/intel/Kconfig.name | 2 + src/mainboard/iwave/Kconfig.name | 2 + src/mainboard/iwill/Kconfig.name | 2 + src/mainboard/jetway/Kconfig.name | 2 + src/mainboard/kontron/Kconfig.name | 2 + src/mainboard/lanner/Kconfig.name | 2 + src/mainboard/lenovo/Kconfig.name | 2 + src/mainboard/linutop/Kconfig.name | 2 + src/mainboard/lippert/Kconfig.name | 2 + src/mainboard/mitac/Kconfig.name | 2 + src/mainboard/msi/Kconfig.name | 2 + src/mainboard/nec/Kconfig.name | 2 + src/mainboard/newisys/Kconfig.name | 2 + src/mainboard/nokia/Kconfig.name | 2 + src/mainboard/nvidia/Kconfig.name | 2 + src/mainboard/packardbell/Kconfig.name | 2 + src/mainboard/pcengines/Kconfig.name | 2 + src/mainboard/rca/Kconfig.name | 2 + src/mainboard/roda/Kconfig.name | 2 + src/mainboard/samsung/Kconfig.name | 2 + src/mainboard/siemens/Kconfig.name | 2 + src/mainboard/soyo/Kconfig.name | 2 + src/mainboard/sunw/Kconfig.name | 2 + src/mainboard/supermicro/Kconfig.name | 2 + src/mainboard/technexion/Kconfig.name | 2 + src/mainboard/thomson/Kconfig.name | 2 + src/mainboard/ti/Kconfig.name | 2 + src/mainboard/traverse/Kconfig.name | 2 + src/mainboard/tyan/Kconfig.name | 2 + src/mainboard/via/Kconfig.name | 2 + src/mainboard/winent/Kconfig.name | 2 + src/mainboard/wyse/Kconfig.name | 2 + 88 files changed, 176 insertions(+), 258 deletions(-) diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 610bfbb..d7cdc3d 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -4,204 +4,11 @@ choice prompt "Mainboard vendor" default VENDOR_EMULATION -config VENDOR_AAEON - bool "Aaeon" -config VENDOR_ABIT - bool "Abit" -config VENDOR_ADLINK - bool "ADLINK" -config VENDOR_ADVANSUS - bool "Advansus" -config VENDOR_AMD - bool "AMD" -config VENDOR_AOPEN - bool "AOpen" -config VENDOR_APPLE - bool "Apple" -config VENDOR_ARIMA - bool "Arima" -config VENDOR_ARTECGROUP - bool "Artec Group" -config VENDOR_ASROCK - bool "ASROCK" -config VENDOR_ASUS - bool "ASUS" -config VENDOR_A_TREND - bool "A-Trend" -config VENDOR_AVALUE - bool "AVALUE" -config VENDOR_AZZA - bool "AZZA" -config VENDOR_BACHMANN - bool "Bachmann electronic" -config VENDOR_BCOM - bool "BCOM" -config VENDOR_BIFFEROS - bool "Bifferos" -config VENDOR_BIOSTAR - bool "Biostar" -config VENDOR_BROADCOM - bool "Broadcom" -config VENDOR_COMPAQ - bool "Compaq" -config VENDOR_CUBIETECH - bool "Cubietech" -config VENDOR_DIGITALLOGIC - bool "DIGITAL-LOGIC" -config VENDOR_DMP - bool "DMP" -config VENDOR_ECS - bool "ECS" -config VENDOR_EMULATION - bool "Emulation" -config VENDOR_GETAC - bool "Getac" -config VENDOR_GIGABYTE - bool "GIGABYTE" -config VENDOR_GIZMOSPHERE - bool "GizmoSphere" -config VENDOR_GOOGLE - bool "Google" -config VENDOR_HP - bool "HP" -config VENDOR_IBASE - bool "iBase" -config VENDOR_IBM - bool "IBM" -config VENDOR_IEI - bool "IEI" -config VENDOR_INTEL - bool "Intel" -config VENDOR_IWAVE - bool "iWave" -config VENDOR_IWILL - bool "IWILL" -config VENDOR_JETWAY - bool "Jetway" -config VENDOR_KONTRON - bool "Kontron" -config VENDOR_LANNER - bool "Lanner" -config VENDOR_LENOVO - bool "Lenovo" -config VENDOR_LINUTOP - bool "Linutop" -config VENDOR_LIPPERT - bool "LiPPERT" -config VENDOR_MITAC - bool "Mitac" -config VENDOR_MSI - bool "MSI" -config VENDOR_NEC - bool "NEC" -config VENDOR_NEWISYS - bool "Newisys" -config VENDOR_NOKIA - bool "Nokia" -config VENDOR_NVIDIA - bool "NVIDIA" -config VENDOR_PACKARDBELL - bool "Packard Bell" -config VENDOR_PCENGINES - bool "PC Engines" -config VENDOR_RCA - bool "RCA" -config VENDOR_RODA - bool "Roda" -config VENDOR_SAMSUNG - bool "SAMSUNG" -config VENDOR_SIEMENS - bool "Siemens" -config VENDOR_SOYO - bool "Soyo" -config VENDOR_SUNW - bool "Sun" -config VENDOR_SUPERMICRO - bool "Supermicro" -config VENDOR_TECHNEXION - bool "Technexion" -config VENDOR_TI - bool "TI" -config VENDOR_THOMSON - bool "Thomson" -config VENDOR_TRAVERSE - bool "Traverse Technologies" -config VENDOR_TYAN - bool "Tyan" -config VENDOR_VIA - bool "VIA" -config VENDOR_WINENT - bool "Win Enterprises" -config VENDOR_WYSE - bool "Wyse" +source "src/mainboard/*/Kconfig.name" endchoice -source "src/mainboard/a-trend/Kconfig" -source "src/mainboard/aaeon/Kconfig" -source "src/mainboard/abit/Kconfig" -source "src/mainboard/adlink/Kconfig" -source "src/mainboard/advansus/Kconfig" -source "src/mainboard/amd/Kconfig" -source "src/mainboard/aopen/Kconfig" -source "src/mainboard/apple/Kconfig" -source "src/mainboard/arima/Kconfig" -source "src/mainboard/artecgroup/Kconfig" -source "src/mainboard/asrock/Kconfig" -source "src/mainboard/asus/Kconfig" -source "src/mainboard/avalue/Kconfig" -source "src/mainboard/azza/Kconfig" -source "src/mainboard/bachmann/Kconfig" -source "src/mainboard/bcom/Kconfig" -source "src/mainboard/bifferos/Kconfig" -source "src/mainboard/biostar/Kconfig" -source "src/mainboard/broadcom/Kconfig" -source "src/mainboard/compaq/Kconfig" -source "src/mainboard/cubietech/Kconfig" -source "src/mainboard/digitallogic/Kconfig" -source "src/mainboard/dmp/Kconfig" -source "src/mainboard/ecs/Kconfig" -source "src/mainboard/emulation/Kconfig" -source "src/mainboard/getac/Kconfig" -source "src/mainboard/gigabyte/Kconfig" -source "src/mainboard/gizmosphere/Kconfig" -source "src/mainboard/google/Kconfig" -source "src/mainboard/hp/Kconfig" -source "src/mainboard/ibase/Kconfig" -source "src/mainboard/ibm/Kconfig" -source "src/mainboard/iei/Kconfig" -source "src/mainboard/intel/Kconfig" -source "src/mainboard/iwave/Kconfig" -source "src/mainboard/iwill/Kconfig" -source "src/mainboard/jetway/Kconfig" -source "src/mainboard/kontron/Kconfig" -source "src/mainboard/lanner/Kconfig" -source "src/mainboard/lenovo/Kconfig" -source "src/mainboard/linutop/Kconfig" -source "src/mainboard/lippert/Kconfig" -source "src/mainboard/mitac/Kconfig" -source "src/mainboard/msi/Kconfig" -source "src/mainboard/nec/Kconfig" -source "src/mainboard/newisys/Kconfig" -source "src/mainboard/nokia/Kconfig" -source "src/mainboard/nvidia/Kconfig" -source "src/mainboard/packardbell/Kconfig" -source "src/mainboard/pcengines/Kconfig" -source "src/mainboard/rca/Kconfig" -source "src/mainboard/roda/Kconfig" -source "src/mainboard/samsung/Kconfig" -source "src/mainboard/siemens/Kconfig" -source "src/mainboard/soyo/Kconfig" -source "src/mainboard/sunw/Kconfig" -source "src/mainboard/supermicro/Kconfig" -source "src/mainboard/technexion/Kconfig" -source "src/mainboard/thomson/Kconfig" -source "src/mainboard/ti/Kconfig" -source "src/mainboard/traverse/Kconfig" -source "src/mainboard/tyan/Kconfig" -source "src/mainboard/via/Kconfig" -source "src/mainboard/winent/Kconfig" -source "src/mainboard/wyse/Kconfig" +source "src/mainboard/*/Kconfig" config BOARD_ROMSIZE_KB_64 bool diff --git a/src/mainboard/a-trend/Kconfig.name b/src/mainboard/a-trend/Kconfig.name new file mode 100644 index 0000000..d7e2287 --- /dev/null +++ b/src/mainboard/a-trend/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_A_TREND + bool "A-Trend" diff --git a/src/mainboard/aaeon/Kconfig.name b/src/mainboard/aaeon/Kconfig.name new file mode 100644 index 0000000..5a4e51e --- /dev/null +++ b/src/mainboard/aaeon/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_AAEON + bool "Aaeon" diff --git a/src/mainboard/abit/Kconfig.name b/src/mainboard/abit/Kconfig.name new file mode 100644 index 0000000..385be00 --- /dev/null +++ b/src/mainboard/abit/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ABIT + bool "Abit" diff --git a/src/mainboard/adlink/Kconfig.name b/src/mainboard/adlink/Kconfig.name new file mode 100644 index 0000000..fb8d433 --- /dev/null +++ b/src/mainboard/adlink/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ADLINK + bool "ADLINK" diff --git a/src/mainboard/advansus/Kconfig.name b/src/mainboard/advansus/Kconfig.name new file mode 100644 index 0000000..f610ef9 --- /dev/null +++ b/src/mainboard/advansus/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ADVANSUS + bool "Advansus" diff --git a/src/mainboard/amd/Kconfig.name b/src/mainboard/amd/Kconfig.name new file mode 100644 index 0000000..d512a9b --- /dev/null +++ b/src/mainboard/amd/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_AMD + bool "AMD" diff --git a/src/mainboard/aopen/Kconfig.name b/src/mainboard/aopen/Kconfig.name new file mode 100644 index 0000000..01ea2b6 --- /dev/null +++ b/src/mainboard/aopen/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_AOPEN + bool "AOpen" diff --git a/src/mainboard/apple/Kconfig.name b/src/mainboard/apple/Kconfig.name new file mode 100644 index 0000000..8bf1eb8 --- /dev/null +++ b/src/mainboard/apple/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_APPLE + bool "Apple" diff --git a/src/mainboard/arima/Kconfig.name b/src/mainboard/arima/Kconfig.name new file mode 100644 index 0000000..9e18ffb --- /dev/null +++ b/src/mainboard/arima/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ARIMA + bool "Arima" diff --git a/src/mainboard/artecgroup/Kconfig.name b/src/mainboard/artecgroup/Kconfig.name new file mode 100644 index 0000000..7319f9d --- /dev/null +++ b/src/mainboard/artecgroup/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ARTECGROUP + bool "Artec Group" diff --git a/src/mainboard/asrock/Kconfig.name b/src/mainboard/asrock/Kconfig.name new file mode 100644 index 0000000..71fcbc3 --- /dev/null +++ b/src/mainboard/asrock/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ASROCK + bool "ASROCK" diff --git a/src/mainboard/asus/Kconfig.name b/src/mainboard/asus/Kconfig.name new file mode 100644 index 0000000..52ef82a --- /dev/null +++ b/src/mainboard/asus/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ASUS + bool "ASUS" diff --git a/src/mainboard/avalue/Kconfig.name b/src/mainboard/avalue/Kconfig.name new file mode 100644 index 0000000..27c5511 --- /dev/null +++ b/src/mainboard/avalue/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_AVALUE + bool "AVALUE" diff --git a/src/mainboard/azza/Kconfig.name b/src/mainboard/azza/Kconfig.name new file mode 100644 index 0000000..0b6401d --- /dev/null +++ b/src/mainboard/azza/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_AZZA + bool "AZZA" diff --git a/src/mainboard/bachmann/Kconfig.name b/src/mainboard/bachmann/Kconfig.name new file mode 100644 index 0000000..ab6bc1e --- /dev/null +++ b/src/mainboard/bachmann/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_BACHMANN + bool "Bachmann electronic" diff --git a/src/mainboard/bcom/Kconfig.name b/src/mainboard/bcom/Kconfig.name new file mode 100644 index 0000000..ac9686b --- /dev/null +++ b/src/mainboard/bcom/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_BCOM + bool "BCOM" diff --git a/src/mainboard/bifferos/Kconfig.name b/src/mainboard/bifferos/Kconfig.name new file mode 100644 index 0000000..d16063e --- /dev/null +++ b/src/mainboard/bifferos/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_BIFFEROS + bool "Bifferos" diff --git a/src/mainboard/biostar/Kconfig.name b/src/mainboard/biostar/Kconfig.name new file mode 100644 index 0000000..231b0d2 --- /dev/null +++ b/src/mainboard/biostar/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_BIOSTAR + bool "Biostar" diff --git a/src/mainboard/broadcom/Kconfig.name b/src/mainboard/broadcom/Kconfig.name new file mode 100644 index 0000000..434694f --- /dev/null +++ b/src/mainboard/broadcom/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_BROADCOM + bool "Broadcom" diff --git a/src/mainboard/compaq/Kconfig.name b/src/mainboard/compaq/Kconfig.name new file mode 100644 index 0000000..0fc95d5 --- /dev/null +++ b/src/mainboard/compaq/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_COMPAQ + bool "Compaq" diff --git a/src/mainboard/cubietech/Kconfig.name b/src/mainboard/cubietech/Kconfig.name new file mode 100644 index 0000000..0ebc088 --- /dev/null +++ b/src/mainboard/cubietech/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_CUBIETECH + bool "Cubietech" diff --git a/src/mainboard/digitallogic/Kconfig.name b/src/mainboard/digitallogic/Kconfig.name new file mode 100644 index 0000000..e47eadf --- /dev/null +++ b/src/mainboard/digitallogic/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_DIGITALLOGIC + bool "DIGITAL-LOGIC" diff --git a/src/mainboard/dmp/Kconfig.name b/src/mainboard/dmp/Kconfig.name new file mode 100644 index 0000000..ddce56a --- /dev/null +++ b/src/mainboard/dmp/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_DMP + bool "DMP" diff --git a/src/mainboard/ecs/Kconfig.name b/src/mainboard/ecs/Kconfig.name new file mode 100644 index 0000000..778c369 --- /dev/null +++ b/src/mainboard/ecs/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_ECS + bool "ECS" diff --git a/src/mainboard/emulation/Kconfig.name b/src/mainboard/emulation/Kconfig.name new file mode 100644 index 0000000..cf9dffa --- /dev/null +++ b/src/mainboard/emulation/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_EMULATION + bool "Emulation" diff --git a/src/mainboard/getac/Kconfig.name b/src/mainboard/getac/Kconfig.name new file mode 100644 index 0000000..089a616 --- /dev/null +++ b/src/mainboard/getac/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_GETAC + bool "Getac" diff --git a/src/mainboard/gigabyte/Kconfig.name b/src/mainboard/gigabyte/Kconfig.name new file mode 100644 index 0000000..d98df3e --- /dev/null +++ b/src/mainboard/gigabyte/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_GIGABYTE + bool "GIGABYTE" diff --git a/src/mainboard/gizmosphere/Kconfig.name b/src/mainboard/gizmosphere/Kconfig.name new file mode 100644 index 0000000..dacb5d8 --- /dev/null +++ b/src/mainboard/gizmosphere/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_GIZMOSPHERE + bool "GizmoSphere" diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig index c193d81..98ec046 100644 --- a/src/mainboard/google/Kconfig +++ b/src/mainboard/google/Kconfig @@ -21,72 +21,11 @@ if VENDOR_GOOGLE choice prompt "Mainboard model" -config BOARD_GOOGLE_BOLT - bool "Bolt" -config BOARD_GOOGLE_BUTTERFLY - bool "Butterfly" -config BOARD_GOOGLE_DAISY - bool "Daisy" -config BOARD_GOOGLE_FALCO - bool "Falco" -config BOARD_GOOGLE_LINK - bool "Link" -config BOARD_GOOGLE_NYAN - bool "Nyan" -config BOARD_GOOGLE_NYAN_BIG - bool "Nyan Big" -config BOARD_GOOGLE_NYAN_BLAZE - bool "Nyan Blaze" -config BOARD_GOOGLE_PANTHER - bool "Panther" -config BOARD_GOOGLE_PARROT - bool "Parrot" -config BOARD_GOOGLE_PEACH_PIT - bool "Peach Pit" -config BOARD_GOOGLE_PEPPY - bool "Peppy" -config BOARD_GOOGLE_RAMBI - bool "Rambi" -config BOARD_GOOGLE_RUSH - bool "Rush" -config BOARD_GOOGLE_RUSH_RYU - bool "Rush Ryu" -config BOARD_GOOGLE_SAMUS - bool "Samus" -config BOARD_GOOGLE_SLIPPY - bool "Slippy" -config BOARD_GOOGLE_STORM - bool "Storm" -config BOARD_GOOGLE_STOUT - bool "Stout" -config BOARD_GOOGLE_URARA - bool "Urara" -config BOARD_GOOGLE_VEYRON_PINKY - bool "Veyron_Pinky" +source "src/mainboard/google/*/Kconfig.name" endchoice -source "src/mainboard/google/bolt/Kconfig" -source "src/mainboard/google/butterfly/Kconfig" -source "src/mainboard/google/daisy/Kconfig" -source "src/mainboard/google/falco/Kconfig" -source "src/mainboard/google/link/Kconfig" -source "src/mainboard/google/nyan/Kconfig" -source "src/mainboard/google/nyan_big/Kconfig" -source "src/mainboard/google/nyan_blaze/Kconfig" -source "src/mainboard/google/panther/Kconfig" -source "src/mainboard/google/parrot/Kconfig" -source "src/mainboard/google/peach_pit/Kconfig" -source "src/mainboard/google/peppy/Kconfig" -source "src/mainboard/google/rambi/Kconfig" -source "src/mainboard/google/rush/Kconfig" -source "src/mainboard/google/rush_ryu/Kconfig" -source "src/mainboard/google/samus/Kconfig" -source "src/mainboard/google/slippy/Kconfig" -source "src/mainboard/google/storm/Kconfig" -source "src/mainboard/google/stout/Kconfig" -source "src/mainboard/google/urara/Kconfig" -source "src/mainboard/google/veyron_pinky/Kconfig" +source "src/mainboard/google/*/Kconfig" config MAINBOARD_VENDOR string "Mainboard Vendor" diff --git a/src/mainboard/google/Kconfig.name b/src/mainboard/google/Kconfig.name new file mode 100644 index 0000000..6ae874b --- /dev/null +++ b/src/mainboard/google/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_GOOGLE + bool "Google" diff --git a/src/mainboard/google/bolt/Kconfig.name b/src/mainboard/google/bolt/Kconfig.name new file mode 100644 index 0000000..4794eca --- /dev/null +++ b/src/mainboard/google/bolt/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_BOLT + bool "Bolt" diff --git a/src/mainboard/google/butterfly/Kconfig.name b/src/mainboard/google/butterfly/Kconfig.name new file mode 100644 index 0000000..1e046e5 --- /dev/null +++ b/src/mainboard/google/butterfly/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_BUTTERFLY + bool "Butterfly" diff --git a/src/mainboard/google/daisy/Kconfig.name b/src/mainboard/google/daisy/Kconfig.name new file mode 100644 index 0000000..0fc3f6b --- /dev/null +++ b/src/mainboard/google/daisy/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_DAISY + bool "Daisy" diff --git a/src/mainboard/google/falco/Kconfig.name b/src/mainboard/google/falco/Kconfig.name new file mode 100644 index 0000000..2cb5ad8 --- /dev/null +++ b/src/mainboard/google/falco/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_FALCO + bool "Falco" diff --git a/src/mainboard/google/link/Kconfig.name b/src/mainboard/google/link/Kconfig.name new file mode 100644 index 0000000..289164b --- /dev/null +++ b/src/mainboard/google/link/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_LINK + bool "Link" diff --git a/src/mainboard/google/nyan/Kconfig.name b/src/mainboard/google/nyan/Kconfig.name new file mode 100644 index 0000000..7bd64bb --- /dev/null +++ b/src/mainboard/google/nyan/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_NYAN + bool "Nyan" diff --git a/src/mainboard/google/nyan_big/Kconfig.name b/src/mainboard/google/nyan_big/Kconfig.name new file mode 100644 index 0000000..66ea877 --- /dev/null +++ b/src/mainboard/google/nyan_big/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_NYAN_BIG + bool "Nyan Big" diff --git a/src/mainboard/google/nyan_blaze/Kconfig.name b/src/mainboard/google/nyan_blaze/Kconfig.name new file mode 100644 index 0000000..a8dd164 --- /dev/null +++ b/src/mainboard/google/nyan_blaze/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_NYAN_BLAZE + bool "Nyan Blaze" diff --git a/src/mainboard/google/panther/Kconfig.name b/src/mainboard/google/panther/Kconfig.name new file mode 100644 index 0000000..c8cd14b --- /dev/null +++ b/src/mainboard/google/panther/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_PANTHER + bool "Panther" diff --git a/src/mainboard/google/parrot/Kconfig.name b/src/mainboard/google/parrot/Kconfig.name new file mode 100644 index 0000000..7bbc998 --- /dev/null +++ b/src/mainboard/google/parrot/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_PARROT + bool "Parrot" diff --git a/src/mainboard/google/peach_pit/Kconfig.name b/src/mainboard/google/peach_pit/Kconfig.name new file mode 100644 index 0000000..a3be909 --- /dev/null +++ b/src/mainboard/google/peach_pit/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_PEACH_PIT + bool "Peach Pit" diff --git a/src/mainboard/google/peppy/Kconfig.name b/src/mainboard/google/peppy/Kconfig.name new file mode 100644 index 0000000..8049a54 --- /dev/null +++ b/src/mainboard/google/peppy/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_PEPPY + bool "Peppy" diff --git a/src/mainboard/google/rambi/Kconfig.name b/src/mainboard/google/rambi/Kconfig.name new file mode 100644 index 0000000..b1b0b6a --- /dev/null +++ b/src/mainboard/google/rambi/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_RAMBI + bool "Rambi" diff --git a/src/mainboard/google/rush/Kconfig.name b/src/mainboard/google/rush/Kconfig.name new file mode 100644 index 0000000..fff6eb4 --- /dev/null +++ b/src/mainboard/google/rush/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_RUSH + bool "Rush" diff --git a/src/mainboard/google/rush_ryu/Kconfig.name b/src/mainboard/google/rush_ryu/Kconfig.name new file mode 100644 index 0000000..a616f23 --- /dev/null +++ b/src/mainboard/google/rush_ryu/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_RUSH_RYU + bool "Rush Ryu" diff --git a/src/mainboard/google/samus/Kconfig.name b/src/mainboard/google/samus/Kconfig.name new file mode 100644 index 0000000..6765d16 --- /dev/null +++ b/src/mainboard/google/samus/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_SAMUS + bool "Samus" diff --git a/src/mainboard/google/slippy/Kconfig.name b/src/mainboard/google/slippy/Kconfig.name new file mode 100644 index 0000000..4892fca --- /dev/null +++ b/src/mainboard/google/slippy/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_SLIPPY + bool "Slippy" diff --git a/src/mainboard/google/storm/Kconfig.name b/src/mainboard/google/storm/Kconfig.name new file mode 100644 index 0000000..72e2df5 --- /dev/null +++ b/src/mainboard/google/storm/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_STORM + bool "Storm" diff --git a/src/mainboard/google/stout/Kconfig.name b/src/mainboard/google/stout/Kconfig.name new file mode 100644 index 0000000..8b007f1 --- /dev/null +++ b/src/mainboard/google/stout/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_STOUT + bool "Stout" diff --git a/src/mainboard/google/urara/Kconfig.name b/src/mainboard/google/urara/Kconfig.name new file mode 100644 index 0000000..edc935a --- /dev/null +++ b/src/mainboard/google/urara/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_URARA + bool "Urara" diff --git a/src/mainboard/google/veyron_pinky/Kconfig.name b/src/mainboard/google/veyron_pinky/Kconfig.name new file mode 100644 index 0000000..37d92f2 --- /dev/null +++ b/src/mainboard/google/veyron_pinky/Kconfig.name @@ -0,0 +1,2 @@ +config BOARD_GOOGLE_VEYRON_PINKY + bool "Veyron_Pinky" diff --git a/src/mainboard/hp/Kconfig.name b/src/mainboard/hp/Kconfig.name new file mode 100644 index 0000000..09398e2 --- /dev/null +++ b/src/mainboard/hp/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_HP + bool "HP" diff --git a/src/mainboard/ibase/Kconfig.name b/src/mainboard/ibase/Kconfig.name new file mode 100644 index 0000000..921ecef --- /dev/null +++ b/src/mainboard/ibase/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_IBASE + bool "iBase" diff --git a/src/mainboard/ibm/Kconfig.name b/src/mainboard/ibm/Kconfig.name new file mode 100644 index 0000000..7f3cb17 --- /dev/null +++ b/src/mainboard/ibm/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_IBM + bool "IBM" diff --git a/src/mainboard/iei/Kconfig.name b/src/mainboard/iei/Kconfig.name new file mode 100644 index 0000000..1dec78d --- /dev/null +++ b/src/mainboard/iei/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_IEI + bool "IEI" diff --git a/src/mainboard/intel/Kconfig.name b/src/mainboard/intel/Kconfig.name new file mode 100644 index 0000000..44eafbb --- /dev/null +++ b/src/mainboard/intel/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_INTEL + bool "Intel" diff --git a/src/mainboard/iwave/Kconfig.name b/src/mainboard/iwave/Kconfig.name new file mode 100644 index 0000000..2babae3 --- /dev/null +++ b/src/mainboard/iwave/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_IWAVE + bool "iWave" diff --git a/src/mainboard/iwill/Kconfig.name b/src/mainboard/iwill/Kconfig.name new file mode 100644 index 0000000..026608b --- /dev/null +++ b/src/mainboard/iwill/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_IWILL + bool "IWILL" diff --git a/src/mainboard/jetway/Kconfig.name b/src/mainboard/jetway/Kconfig.name new file mode 100644 index 0000000..3012839 --- /dev/null +++ b/src/mainboard/jetway/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_JETWAY + bool "Jetway" diff --git a/src/mainboard/kontron/Kconfig.name b/src/mainboard/kontron/Kconfig.name new file mode 100644 index 0000000..4471222 --- /dev/null +++ b/src/mainboard/kontron/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_KONTRON + bool "Kontron" diff --git a/src/mainboard/lanner/Kconfig.name b/src/mainboard/lanner/Kconfig.name new file mode 100644 index 0000000..69026c5 --- /dev/null +++ b/src/mainboard/lanner/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_LANNER + bool "Lanner" diff --git a/src/mainboard/lenovo/Kconfig.name b/src/mainboard/lenovo/Kconfig.name new file mode 100644 index 0000000..82596e6 --- /dev/null +++ b/src/mainboard/lenovo/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_LENOVO + bool "Lenovo" diff --git a/src/mainboard/linutop/Kconfig.name b/src/mainboard/linutop/Kconfig.name new file mode 100644 index 0000000..34f538d --- /dev/null +++ b/src/mainboard/linutop/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_LINUTOP + bool "Linutop" diff --git a/src/mainboard/lippert/Kconfig.name b/src/mainboard/lippert/Kconfig.name new file mode 100644 index 0000000..9a0c11c --- /dev/null +++ b/src/mainboard/lippert/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_LIPPERT + bool "LiPPERT" diff --git a/src/mainboard/mitac/Kconfig.name b/src/mainboard/mitac/Kconfig.name new file mode 100644 index 0000000..f9c1c4b --- /dev/null +++ b/src/mainboard/mitac/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_MITAC + bool "Mitac" diff --git a/src/mainboard/msi/Kconfig.name b/src/mainboard/msi/Kconfig.name new file mode 100644 index 0000000..3f4668f --- /dev/null +++ b/src/mainboard/msi/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_MSI + bool "MSI" diff --git a/src/mainboard/nec/Kconfig.name b/src/mainboard/nec/Kconfig.name new file mode 100644 index 0000000..5f4f892 --- /dev/null +++ b/src/mainboard/nec/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_NEC + bool "NEC" diff --git a/src/mainboard/newisys/Kconfig.name b/src/mainboard/newisys/Kconfig.name new file mode 100644 index 0000000..8cae8ba --- /dev/null +++ b/src/mainboard/newisys/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_NEWISYS + bool "Newisys" diff --git a/src/mainboard/nokia/Kconfig.name b/src/mainboard/nokia/Kconfig.name new file mode 100644 index 0000000..64c55b0 --- /dev/null +++ b/src/mainboard/nokia/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_NOKIA + bool "Nokia" diff --git a/src/mainboard/nvidia/Kconfig.name b/src/mainboard/nvidia/Kconfig.name new file mode 100644 index 0000000..44b0fa6 --- /dev/null +++ b/src/mainboard/nvidia/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_NVIDIA + bool "NVIDIA" diff --git a/src/mainboard/packardbell/Kconfig.name b/src/mainboard/packardbell/Kconfig.name new file mode 100644 index 0000000..d379481 --- /dev/null +++ b/src/mainboard/packardbell/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_PACKARDBELL + bool "Packard Bell" diff --git a/src/mainboard/pcengines/Kconfig.name b/src/mainboard/pcengines/Kconfig.name new file mode 100644 index 0000000..4368086 --- /dev/null +++ b/src/mainboard/pcengines/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_PCENGINES + bool "PC Engines" diff --git a/src/mainboard/rca/Kconfig.name b/src/mainboard/rca/Kconfig.name new file mode 100644 index 0000000..3534996 --- /dev/null +++ b/src/mainboard/rca/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_RCA + bool "RCA" diff --git a/src/mainboard/roda/Kconfig.name b/src/mainboard/roda/Kconfig.name new file mode 100644 index 0000000..cb8ba8c --- /dev/null +++ b/src/mainboard/roda/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_RODA + bool "Roda" diff --git a/src/mainboard/samsung/Kconfig.name b/src/mainboard/samsung/Kconfig.name new file mode 100644 index 0000000..c60fd96 --- /dev/null +++ b/src/mainboard/samsung/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_SAMSUNG + bool "SAMSUNG" diff --git a/src/mainboard/siemens/Kconfig.name b/src/mainboard/siemens/Kconfig.name new file mode 100644 index 0000000..971bcf6 --- /dev/null +++ b/src/mainboard/siemens/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_SIEMENS + bool "Siemens" diff --git a/src/mainboard/soyo/Kconfig.name b/src/mainboard/soyo/Kconfig.name new file mode 100644 index 0000000..33f29ff --- /dev/null +++ b/src/mainboard/soyo/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_SOYO + bool "Soyo" diff --git a/src/mainboard/sunw/Kconfig.name b/src/mainboard/sunw/Kconfig.name new file mode 100644 index 0000000..c3783a3 --- /dev/null +++ b/src/mainboard/sunw/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_SUNW + bool "Sun Microsystems" diff --git a/src/mainboard/supermicro/Kconfig.name b/src/mainboard/supermicro/Kconfig.name new file mode 100644 index 0000000..6aa397a --- /dev/null +++ b/src/mainboard/supermicro/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_SUPERMICRO + bool "Supermicro" diff --git a/src/mainboard/technexion/Kconfig.name b/src/mainboard/technexion/Kconfig.name new file mode 100644 index 0000000..6366ff5 --- /dev/null +++ b/src/mainboard/technexion/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_TECHNEXION + bool "Technexion" diff --git a/src/mainboard/thomson/Kconfig.name b/src/mainboard/thomson/Kconfig.name new file mode 100644 index 0000000..b22bbbb --- /dev/null +++ b/src/mainboard/thomson/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_THOMSON + bool "Thomson" diff --git a/src/mainboard/ti/Kconfig.name b/src/mainboard/ti/Kconfig.name new file mode 100644 index 0000000..664cf8f --- /dev/null +++ b/src/mainboard/ti/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_TI + bool "TI" diff --git a/src/mainboard/traverse/Kconfig.name b/src/mainboard/traverse/Kconfig.name new file mode 100644 index 0000000..e4763a6 --- /dev/null +++ b/src/mainboard/traverse/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_TRAVERSE + bool "Traverse Technologies" diff --git a/src/mainboard/tyan/Kconfig.name b/src/mainboard/tyan/Kconfig.name new file mode 100644 index 0000000..ee21057 --- /dev/null +++ b/src/mainboard/tyan/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_TYAN + bool "Tyan" diff --git a/src/mainboard/via/Kconfig.name b/src/mainboard/via/Kconfig.name new file mode 100644 index 0000000..9015389 --- /dev/null +++ b/src/mainboard/via/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_VIA + bool "VIA" diff --git a/src/mainboard/winent/Kconfig.name b/src/mainboard/winent/Kconfig.name new file mode 100644 index 0000000..6405d0b --- /dev/null +++ b/src/mainboard/winent/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_WINENT + bool "Win Enterprises" diff --git a/src/mainboard/wyse/Kconfig.name b/src/mainboard/wyse/Kconfig.name new file mode 100644 index 0000000..37864fa --- /dev/null +++ b/src/mainboard/wyse/Kconfig.name @@ -0,0 +1,2 @@ +config VENDOR_WYSE + bool "Wyse"

1 0

Patch set updated for coreboot: 5a770a0 kconfig: Add wildcard support for "source"
by Stefan Reinauer 05 Apr '15

05 Apr '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9294 -gerrit commit 5a770a0a7bbf27d9119438c9124e40aaa823573d Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Fri Apr 3 20:01:38 2015 +0200 kconfig: Add wildcard support for "source" Kconfig's include directive "source" does not support wildcards (e.g. source src/mainboard/*/Kconfig) which makes automatic inclusion of all boards a tedious task and prevents us from implementing "drop in" boards. In our Makefile.inc files we already include mainboard directories per wildcard, so let's add the infrastructure to do the same with Kconfig. Change-Id: I1988ff6ce3e167e86bb5cb65fc04a13748599dad Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/kconfig/Makefile | 4 +- util/kconfig/lkc.h | 1 + util/kconfig/zconf.l | 16 +++ util/kconfig/zconf.lex.c_shipped | 71 +++++++---- util/kconfig/zconf.tab.c_shipped | 257 +++++++++++++++++++-------------------- util/kconfig/zconf.y | 2 +- 6 files changed, 186 insertions(+), 165 deletions(-) diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index e1fc368..009e245 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -326,10 +326,10 @@ $(obj)/zconf.lex.c: $(src)/zconf.l $(obj)/zconf.hash.c: $(src)/zconf.gperf %.tab.c: %.y - bison -l -b $* -p $(notdir $*) $< + bison -t -l -b $* -p $(notdir $*) $< cp $@ $@_shipped -lex.%.c: %.l +%.lex.c: %.l flex -L -P$(notdir $*) -o$@ $< cp $@ $@_shipped diff --git a/util/kconfig/lkc.h b/util/kconfig/lkc.h index d5daa7a..590ed80 100644 --- a/util/kconfig/lkc.h +++ b/util/kconfig/lkc.h @@ -78,6 +78,7 @@ void zconf_starthelp(void); FILE *zconf_fopen(const char *name); void zconf_initscan(const char *name); void zconf_nextfile(const char *name); +void zconf_nextfiles(const char *name); int zconf_lineno(void); const char *zconf_curname(void); diff --git a/util/kconfig/zconf.l b/util/kconfig/zconf.l index 1a9f53e..cedcaab 100644 --- a/util/kconfig/zconf.l +++ b/util/kconfig/zconf.l @@ -13,6 +13,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <wordexp.h> #include "lkc.h" @@ -336,6 +337,21 @@ void zconf_nextfile(const char *name) current_file = file; } +void zconf_nextfiles(const char *wildcard) +{ + wordexp_t p; + char **w; + int i; + + wordexp(wildcard, &p, 0); + w = p.we_wordv; + + for (i = p.we_wordc - 1; i >= 0; i--) + zconf_nextfile(w[i]); + + wordfree(&p); +} + static void zconf_endfile(void) { struct buffer *parent; diff --git a/util/kconfig/zconf.lex.c_shipped b/util/kconfig/zconf.lex.c_shipped index a0521aa..1c5ae7c 100644 --- a/util/kconfig/zconf.lex.c_shipped +++ b/util/kconfig/zconf.lex.c_shipped @@ -1,5 +1,5 @@ -#line 3 "scripts/kconfig/zconf.lex.c_shipped" +#line 3 "zconf.lex.c" #define YY_INT_ALIGNED short int @@ -27,7 +27,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_SUBMINOR_VERSION 37 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -72,7 +72,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -103,6 +102,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -171,7 +172,12 @@ typedef unsigned int flex_uint32_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int zconfleng; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t zconfleng; extern FILE *zconfin, *zconfout; @@ -197,11 +203,6 @@ extern FILE *zconfin, *zconfout; #define unput(c) yyunput( c, (yytext_ptr) ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -219,7 +220,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -289,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when zconftext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int zconfleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t zconfleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -318,7 +319,7 @@ static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,yy_size_t len ); void *zconfalloc (yy_size_t ); void *zconfrealloc (void *,yy_size_t ); @@ -350,7 +351,7 @@ void zconffree (void * ); /* Begin user sect3 */ -#define zconfwrap(n) 1 +#define zconfwrap() 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -775,6 +776,7 @@ char *zconftext; #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <wordexp.h> #include "lkc.h" @@ -870,7 +872,7 @@ FILE *zconfget_out (void ); void zconfset_out (FILE * out_str ); -int zconfget_leng (void ); +yy_size_t zconfget_leng (void ); char *zconfget_text (void ); @@ -1515,21 +1517,21 @@ static int yy_get_next_buffer (void) else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1560,7 +1562,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -1630,7 +1632,7 @@ static int yy_get_next_buffer (void) yy_current_state = yy_nxt[yy_current_state][1]; yy_is_jam = (yy_current_state <= 0); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } static void yyunput (int c, register char * yy_bp ) @@ -1645,7 +1647,7 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; + register yy_size_t number_to_move = (yy_n_chars) + 2; register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = @@ -1694,7 +1696,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1966,7 +1968,7 @@ void zconfpop_buffer_state (void) */ static void zconfensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -2058,12 +2060,12 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to zconflex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE zconf_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE zconf_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -2150,7 +2152,7 @@ FILE *zconfget_out (void) /** Get the length of the current token. * */ -int zconfget_leng (void) +yy_size_t zconfget_leng (void) { return zconfleng; } @@ -2392,6 +2394,21 @@ void zconf_nextfile(const char *name) current_file = file; } +void zconf_nextfiles(const char *wildcard) +{ + wordexp_t p; + char **w; + int i; + + wordexp(wildcard, &p, 0); + w = p.we_wordv; + + for (i = p.we_wordc - 1; i >= 0; i--) + zconf_nextfile(w[i]); + + wordfree(&p); +} + static void zconf_endfile(void) { struct buffer *parent; diff --git a/util/kconfig/zconf.tab.c_shipped b/util/kconfig/zconf.tab.c_shipped index 25ae16a..343449b 100644 --- a/util/kconfig/zconf.tab.c_shipped +++ b/util/kconfig/zconf.tab.c_shipped @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 2.7. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "2.7" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,8 +58,6 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ #define yyparse zconfparse @@ -70,7 +68,6 @@ #define yydebug zconfdebug #define yynerrs zconfnerrs - /* Copy the first part of user declarations. */ @@ -108,10 +105,13 @@ static struct menu *current_menu, *current_entry; -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -121,11 +121,14 @@ static struct menu *current_menu, *current_entry; # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int zconfdebug; +#endif /* Tokens. */ #ifndef YYTOKENTYPE @@ -170,7 +173,6 @@ static struct menu *current_menu, *current_entry; #endif - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { @@ -191,6 +193,23 @@ typedef union YYSTYPE # define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE zconflval; + +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int zconfparse (void *YYPARSE_PARAM); +#else +int zconfparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int zconfparse (void); +#else +int zconfparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + + /* Copy the second part of user declarations. */ @@ -251,24 +270,24 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -304,6 +323,7 @@ YYID (yyi) # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif @@ -395,20 +415,20 @@ union yyalloc #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ while (YYID (0)) # endif # endif @@ -547,7 +567,7 @@ static const yytype_uint16 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -568,7 +588,7 @@ static const char *const yytname[] = "menu_entry", "menu_end", "menu_stmt", "menu_block", "source_stmt", "comment", "comment_stmt", "help_start", "help", "depends_list", "depends", "visibility_list", "visible", "prompt_stmt_opt", "prompt", - "end", "nl", "if_expr", "expr", "symbol", "word_opt", 0 + "end", "nl", "if_expr", "expr", "symbol", "word_opt", YY_NULL }; #endif @@ -730,10 +750,10 @@ static const yytype_int16 yytable[] = 184 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-90)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-90))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = @@ -823,62 +843,35 @@ static const yytype_uint8 yystos[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - /* This macro is provided for backward compatibility. */ - #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (YYLEX_PARAM) #else @@ -928,6 +921,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) YYSTYPE const * const yyvaluep; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT @@ -939,7 +934,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) switch (yytype) { default: - break; + break; } } @@ -1179,12 +1174,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULL; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1244,11 +1238,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -1268,10 +1264,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1329,64 +1327,59 @@ yydestruct (yymsg, yytype, yyvaluep) switch (yytype) { - case 53: /* "choice_entry" */ + case 53: /* choice_entry */ - { + { fprintf(stderr, "%s:%d: missing end statement for this entry\n", - (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno); - if (current_menu == (yyvaluep->menu)) + ((*yyvaluep).menu)->file->name, ((*yyvaluep).menu)->lineno); + if (current_menu == ((*yyvaluep).menu)) menu_end_menu(); }; - break; - case 59: /* "if_entry" */ + break; + case 59: /* if_entry */ - { + { fprintf(stderr, "%s:%d: missing end statement for this entry\n", - (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno); - if (current_menu == (yyvaluep->menu)) + ((*yyvaluep).menu)->file->name, ((*yyvaluep).menu)->lineno); + if (current_menu == ((*yyvaluep).menu)) menu_end_menu(); }; - break; - case 65: /* "menu_entry" */ + break; + case 65: /* menu_entry */ - { + { fprintf(stderr, "%s:%d: missing end statement for this entry\n", - (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno); - if (current_menu == (yyvaluep->menu)) + ((*yyvaluep).menu)->file->name, ((*yyvaluep).menu)->lineno); + if (current_menu == ((*yyvaluep).menu)) menu_end_menu(); }; - break; + break; default: - break; + break; } } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /* The lookahead symbol. */ int yychar; + +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1426,7 +1419,7 @@ yyparse () `yyss': related to states. `yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1444,7 +1437,7 @@ yyparse () int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1462,9 +1455,8 @@ yyparse () Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1473,14 +1465,6 @@ yyparse () yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -1621,7 +1605,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1923,7 +1909,7 @@ yyreduce: { printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); - zconf_nextfile((yyvsp[(2) - (3)].string)); + zconf_nextfiles((yyvsp[(2) - (3)].string)); } break; @@ -2219,7 +2205,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -2243,7 +2231,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2535,4 +2523,3 @@ void zconfdump(FILE *out) #include "expr.c" #include "symbol.c" #include "menu.c" - diff --git a/util/kconfig/zconf.y b/util/kconfig/zconf.y index 0653886..41d83eb 100644 --- a/util/kconfig/zconf.y +++ b/util/kconfig/zconf.y @@ -381,7 +381,7 @@ menu_block: source_stmt: T_SOURCE prompt T_EOL { printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2); - zconf_nextfile($2); + zconf_nextfiles($2); }; /* comment entry */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit April 2015