Hi!
Right now, our Kconfig files in the mainboard/ directory in the v3 tree are not exactly in the best shape. - MAINBOARD_NAME is claimed to be the mainboard name, but it is used exclusively as mainboard directory. - MAINBOARD_NAME is set in mainboard/$VENDOR/$BOARD/Kconfig to $VENDOR/$BOARD, but mainboard/$VENDOR/Kconfig already hardcodes $VENDOR/$BOARD as board path. - MAINBOARD_NAME has a help text which will never be displayed to the user.
The following patch is a proof of concept, only touches AMD manufactured mainboards, and is missing conversions for all other board manufacturers to keep the patch short. Diffstat follows: Kconfig | 15 +++++++++++++-- db800/Kconfig | 28 ---------------------------- norwich/Kconfig | 28 ---------------------------- 3 files changed, 13 insertions(+), 58 deletions(-)
Basically, per-board Kconfig files have been deleted, the remnants making sense have been merged into per-vendor Kconfig files and the comments+help texts have been corrected. If there are ever some real per-board options and not just tricks to make the makefiles behave, we can resurrect the per-board Kconfig files.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: mainboard/amd/Kconfig =================================================================== --- mainboard/amd/Kconfig (Revision 693) +++ mainboard/amd/Kconfig (Arbeitskopie) @@ -48,6 +48,17 @@
endchoice
-source "mainboard/amd/db800/Kconfig" -source "mainboard/amd/norwich/Kconfig" +config MAINBOARD_NAME + string + default amd/db800 + depends BOARD_AMD_DB800 + help + This is the mainboard directory.
+config MAINBOARD_NAME + string + default amd/norwich + depends BOARD_AMD_NORWICH + help + This is the mainboard directory. + Index: mainboard/amd/norwich/Kconfig =================================================================== --- mainboard/amd/norwich/Kconfig (Revision 693) +++ mainboard/amd/norwich/Kconfig (Arbeitskopie) @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer stepan@coresystems.de for 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; either version 2 of the License, or -## (at your option) any later version. -## -## 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 MAINBOARD_NAME - string - default amd/norwich - depends BOARD_AMD_NORWICH - help - This is the default mainboard name. - Index: mainboard/amd/db800/Kconfig =================================================================== --- mainboard/amd/db800/Kconfig (Revision 693) +++ mainboard/amd/db800/Kconfig (Arbeitskopie) @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer stepan@coresystems.de for 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; either version 2 of the License, or -## (at your option) any later version. -## -## 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 MAINBOARD_NAME - string - default amd/db800 - depends BOARD_AMD_DB800 - help - This is the default mainboard name. -