diff --git a/Makefile b/Makefile index ffce73f3e6..86f6c9b06a 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ all: prepare prepare2 $(obj)/coreboot.rom $(Q)printf " DONE\n" ARCH:=$(shell echo $(CONFIG_ARCH)) -MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_NAME)) +MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_DIR)) export MAINBOARDDIR COREBOOTINCLUDE := -I$(src) -Iinclude \ diff --git a/mainboard/adl/Kconfig b/mainboard/adl/Kconfig index 365f89d0a0..4737342482 100644 --- a/mainboard/adl/Kconfig +++ b/mainboard/adl/Kconfig @@ -36,5 +36,8 @@ config BOARD_ADL_MSM800SEV endchoice -source "mainboard/adl/msm800sev/Kconfig" +config MAINBOARD_DIR + string + default adl/msm800sev + depends BOARD_ADL_MSM800SEV diff --git a/mainboard/adl/msm800sev/Kconfig b/mainboard/adl/msm800sev/Kconfig deleted file mode 100644 index 918d546386..0000000000 --- a/mainboard/adl/msm800sev/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer 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 adl/msm800sev - depends BOARD_ADL_MSM800SEV - help - This is the name for the Advanced Digital Logic MSM800SEV mainboard. - diff --git a/mainboard/amd/Kconfig b/mainboard/amd/Kconfig index 6da83fdfd2..10891ce4a4 100644 --- a/mainboard/amd/Kconfig +++ b/mainboard/amd/Kconfig @@ -48,6 +48,13 @@ config BOARD_AMD_NORWICH endchoice -source "mainboard/amd/db800/Kconfig" -source "mainboard/amd/norwich/Kconfig" +config MAINBOARD_DIR + string + default amd/db800 + depends BOARD_AMD_DB800 + +config MAINBOARD_DIR + string + default amd/norwich + depends BOARD_AMD_NORWICH diff --git a/mainboard/amd/db800/Kconfig b/mainboard/amd/db800/Kconfig deleted file mode 100644 index 450927d3a8..0000000000 --- a/mainboard/amd/db800/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer 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. - diff --git a/mainboard/amd/norwich/Kconfig b/mainboard/amd/norwich/Kconfig deleted file mode 100644 index 8cf392787a..0000000000 --- a/mainboard/amd/norwich/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer 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. - diff --git a/mainboard/artecgroup/Kconfig b/mainboard/artecgroup/Kconfig index 68d3553b18..aa084b20b1 100644 --- a/mainboard/artecgroup/Kconfig +++ b/mainboard/artecgroup/Kconfig @@ -47,5 +47,12 @@ config BOARD_ARTECGROUP_DBE62 endchoice -source "mainboard/artecgroup/dbe61/Kconfig" -source "mainboard/artecgroup/dbe62/Kconfig" +config MAINBOARD_DIR + string + default artecgroup/dbe61 + depends BOARD_ARTECGROUP_DBE61 + +config MAINBOARD_DIR + string + default artecgroup/dbe62 + depends BOARD_ARTECGROUP_DBE62 diff --git a/mainboard/artecgroup/dbe61/Kconfig b/mainboard/artecgroup/dbe61/Kconfig deleted file mode 100644 index f34739c3dd..0000000000 --- a/mainboard/artecgroup/dbe61/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer 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 artecgroup/dbe61 - depends BOARD_ARTECGROUP_DBE61 - help - This is the default mainboard name. - diff --git a/mainboard/artecgroup/dbe62/Kconfig b/mainboard/artecgroup/dbe62/Kconfig deleted file mode 100644 index 45963b13ea..0000000000 --- a/mainboard/artecgroup/dbe62/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer for coresystems GmbH) -## Copyright (C) 2007 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; 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 artecgroup/dbe62 - depends BOARD_ARTECGROUP_DBE62 - help - This is the default mainboard name. diff --git a/mainboard/emulation/Kconfig b/mainboard/emulation/Kconfig index 336062597d..49e70c333c 100644 --- a/mainboard/emulation/Kconfig +++ b/mainboard/emulation/Kconfig @@ -37,5 +37,8 @@ config BOARD_EMULATION_QEMU_X86 endchoice -source "mainboard/emulation/qemu-x86/Kconfig" +config MAINBOARD_DIR + string + default emulation/qemu-x86 + depends BOARD_EMULATION_QEMU_X86 diff --git a/mainboard/emulation/qemu-x86/Kconfig b/mainboard/emulation/qemu-x86/Kconfig deleted file mode 100644 index a6ecd7a4c5..0000000000 --- a/mainboard/emulation/qemu-x86/Kconfig +++ /dev/null @@ -1,29 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer for coresystems GmbH) -## Copyright (C) 2007 Uwe Hermann -## -## 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 emulation/qemu-x86 - depends BOARD_EMULATION_QEMU_X86 - help - This is the default mainboard name. - diff --git a/mainboard/emulation/qemu-x86/defconfig b/mainboard/emulation/qemu-x86/defconfig index c1742ffa9e..ab6a627548 100644 --- a/mainboard/emulation/qemu-x86/defconfig +++ b/mainboard/emulation/qemu-x86/defconfig @@ -19,7 +19,7 @@ CONFIG_LOCALVERSION="" # CONFIG_VENDOR_ARTECGROUP is not set CONFIG_VENDOR_EMULATION=y # CONFIG_VENDOR_PCENGINES is not set -CONFIG_MAINBOARD_NAME="emulation/qemu-x86" +CONFIG_MAINBOARD_DIR="emulation/qemu-x86" CONFIG_BOARD_EMULATION_QEMU_X86=y # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set CONFIG_COREBOOT_ROMSIZE_KB_256=y diff --git a/mainboard/pcengines/Kconfig b/mainboard/pcengines/Kconfig index d096baf281..595e3e5f56 100644 --- a/mainboard/pcengines/Kconfig +++ b/mainboard/pcengines/Kconfig @@ -48,6 +48,12 @@ config BOARD_PCENGINES_ALIX2C3 endchoice -source "mainboard/pcengines/alix1c/Kconfig" -source "mainboard/pcengines/alix2c3/Kconfig" +config MAINBOARD_DIR + string + default pcengines/alix1c + depends BOARD_PCENGINES_ALIX1C +config MAINBOARD_DIR + string + default pcengines/alix2c3 + depends BOARD_PCENGINES_ALIX2C3 diff --git a/mainboard/pcengines/alix1c/Kconfig b/mainboard/pcengines/alix1c/Kconfig deleted file mode 100644 index d145c16b57..0000000000 --- a/mainboard/pcengines/alix1c/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer for coresystems GmbH) -## Copyright (C) 2007 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; 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 pcengines/alix1c - depends BOARD_PCENGINES_ALIX1C - help - This is the default mainboard name. diff --git a/mainboard/pcengines/alix1c/defconfig b/mainboard/pcengines/alix1c/defconfig index 0016c8f355..122fefd526 100644 --- a/mainboard/pcengines/alix1c/defconfig +++ b/mainboard/pcengines/alix1c/defconfig @@ -20,7 +20,7 @@ CONFIG_LOCALVERSION="" # CONFIG_VENDOR_ARTECGROUP is not set # CONFIG_VENDOR_EMULATION is not set CONFIG_VENDOR_PCENGINES=y -CONFIG_MAINBOARD_NAME="pcengines/alix1c" +CONFIG_MAINBOARD_DIR="pcengines/alix1c" CONFIG_BOARD_PCENGINES_ALIX1C=y # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set diff --git a/mainboard/pcengines/alix2c3/Kconfig b/mainboard/pcengines/alix2c3/Kconfig deleted file mode 100644 index 0a12dbb0d9..0000000000 --- a/mainboard/pcengines/alix2c3/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 coresystems GmbH -## (Written by Stefan Reinauer for coresystems GmbH) -## Copyright (C) 2007 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; 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 pcengines/alix2c3 - depends BOARD_PCENGINES_ALIX2C3 - help - This is the default mainboard name. diff --git a/mainboard/pcengines/alix2c3/defconfig b/mainboard/pcengines/alix2c3/defconfig index 38f63d4c19..cf6a1ffcfb 100644 --- a/mainboard/pcengines/alix2c3/defconfig +++ b/mainboard/pcengines/alix2c3/defconfig @@ -19,7 +19,7 @@ CONFIG_LOCALVERSION="" # CONFIG_VENDOR_ARTECGROUP is not set # CONFIG_VENDOR_EMULATION is not set CONFIG_VENDOR_PCENGINES=y -CONFIG_MAINBOARD_NAME="pcengines/alix2c3" +CONFIG_MAINBOARD_DIR="pcengines/alix2c3" # CONFIG_BOARD_PCENGINES_ALIX1C is not set CONFIG_BOARD_PCENGINES_ALIX2C3=y # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set