summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-08-26 17:10:00 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-08-26 17:10:00 +0000
commitbca3b92df2b4af91d08a7bde76e4a98a9671d946 (patch)
treebd1077b7abf862505c08552c1cdb6ba39fef3f9d /src
parentd7e49b40b14bc96a4b463fabd2f8021be63a3137 (diff)
Add kconfig support for all missing Intel 440BX based boards.
This includes: soyo/sy-6ba-plus-iii a-trend/atc-6240 a-trend/atc-6220 gigabyte/ga-6bxc biostar/m6tba azza/pt-6ibd tyan/s1846 abit/be6-ii_v2_0 compaq/deskpro_en_sff_p600msi/ms6119 msi/ms6147 asus/p2b asus/p2b-d asus/p2b-ds asus/p3b-f The Makefile.inc for all of them are _exactly_ the same, so I made a common src/mainboard/Makefile.romccboard.inc (maybe needs a nicer name). I also suspect that many other romcc-based boards will be able to re-use this Makefile.inc. Apart from the board name, most boards only differ in the Super I/O that's being used and the IRQ_SLOT_COUNT value. The Tyan S1846 is a bit different as it doesn't have an irq_tables.c. I also dropped the broken MS-6178 kconfig stuff for now, I'll submit a proper config in another patch. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Myles Watson <mylesgw@gmail.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4587 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/Makefile.romccboard.inc54
-rw-r--r--src/mainboard/a-trend/Kconfig30
-rw-r--r--src/mainboard/a-trend/atc-6220/Kconfig54
-rw-r--r--src/mainboard/a-trend/atc-6220/Makefile.inc22
-rw-r--r--src/mainboard/a-trend/atc-6240/Kconfig54
-rw-r--r--src/mainboard/a-trend/atc-6240/Makefile.inc22
-rw-r--r--src/mainboard/abit/Kconfig29
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/Kconfig54
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/Makefile.inc22
-rw-r--r--src/mainboard/asus/Kconfig3
-rw-r--r--src/mainboard/asus/p2b-d/Kconfig62
-rw-r--r--src/mainboard/asus/p2b-d/Makefile.inc22
-rw-r--r--src/mainboard/asus/p2b-ds/Kconfig62
-rw-r--r--src/mainboard/asus/p2b-ds/Makefile.inc22
-rw-r--r--src/mainboard/asus/p2b-f/Kconfig5
-rw-r--r--src/mainboard/asus/p2b-f/Makefile.inc34
-rw-r--r--src/mainboard/asus/p2b/Kconfig54
-rw-r--r--src/mainboard/asus/p2b/Makefile.inc22
-rw-r--r--src/mainboard/asus/p3b-f/Kconfig54
-rw-r--r--src/mainboard/asus/p3b-f/Makefile.inc22
-rw-r--r--src/mainboard/azza/Kconfig29
-rw-r--r--src/mainboard/azza/pt-6ibd/Kconfig54
-rw-r--r--src/mainboard/azza/pt-6ibd/Makefile.inc22
-rw-r--r--src/mainboard/biostar/Kconfig29
-rw-r--r--src/mainboard/biostar/m6tba/Kconfig54
-rw-r--r--src/mainboard/biostar/m6tba/Makefile.inc22
-rw-r--r--src/mainboard/compaq/Kconfig29
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/Kconfig54
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc22
-rw-r--r--src/mainboard/gigabyte/Kconfig29
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/Kconfig54
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/Makefile.inc22
-rw-r--r--src/mainboard/msi/Kconfig19
-rw-r--r--src/mainboard/msi/ms6119/Kconfig54
-rw-r--r--src/mainboard/msi/ms6119/Makefile.inc22
-rw-r--r--src/mainboard/msi/ms6147/Kconfig54
-rw-r--r--src/mainboard/msi/ms6147/Makefile.inc22
-rw-r--r--src/mainboard/msi/ms6178/Makefile.inc53
-rw-r--r--src/mainboard/soyo/Kconfig29
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/Kconfig54
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc22
-rw-r--r--src/mainboard/tyan/Kconfig29
-rw-r--r--src/mainboard/tyan/s1846/Kconfig48
-rw-r--r--src/mainboard/tyan/s1846/Makefile.inc22
44 files changed, 1436 insertions, 115 deletions
diff --git a/src/mainboard/Makefile.romccboard.inc b/src/mainboard/Makefile.romccboard.inc
new file mode 100644
index 0000000000..ce52ed884d
--- /dev/null
+++ b/src/mainboard/Makefile.romccboard.inc
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+initobj-y += crt0.o
+crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
+crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
+crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
+crt0-y += ../../../../src/arch/i386/lib/cpu_reset.inc
+crt0-y += ../../../../src/arch/i386/lib/id.inc
+crt0-y += failover.inc
+crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
+crt0-y += ../../../../src/cpu/x86/mmx/enable_mmx.inc
+crt0-y += auto.inc
+crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
+
+ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
+ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds
+ldscript-y += ../../../../src/cpu/x86/32bit/entry32.lds
+ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds
+ldscript-y += ../../../../src/arch/i386/lib/id.lds
+ldscript-y += ../../../../src/arch/i386/lib/failover.lds
+
+driver-y += mainboard.o
+
+obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+
+ifdef POST_EVALUATION
+
+$(obj)/mainboard/$(MAINBOARDDIR)/failover.inc: $(obj)/romcc $(src)/arch/i386/lib/failover.c
+ $(obj)/romcc -mcpu=p2 -O2 --label-prefix=failover $(INCLUDES) $(src)/arch/i386/lib/failover.c -o $@
+
+$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(obj)/romcc $(src)/mainboard/$(MAINBOARDDIR)/auto.c
+ $(obj)/romcc -mcpu=p2 -O2 $(INCLUDES) $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
+
+endif
+
diff --git a/src/mainboard/a-trend/Kconfig b/src/mainboard/a-trend/Kconfig
index 792d600548..f5a379f84d 100644
--- a/src/mainboard/a-trend/Kconfig
+++ b/src/mainboard/a-trend/Kconfig
@@ -1 +1,29 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_A_TREND
+
+source "src/mainboard/a-trend/atc-6220/Kconfig"
+source "src/mainboard/a-trend/atc-6240/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig
new file mode 100644
index 0000000000..217e458215
--- /dev/null
+++ b/src/mainboard/a-trend/atc-6220/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_A_TREND_ATC_6220
+ bool "ATC-6220"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ A-Trend ATC-6220 mainboard.
+
+config MAINBOARD_DIR
+ string
+ default a-trend/atc-6220
+ depends on BOARD_A_TREND_ATC_6220
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "ATC-6220"
+ depends on BOARD_A_TREND_ATC_6220
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_A_TREND_ATC_6220
+
+config IRQ_SLOT_COUNT
+ int
+ default 7
+ depends on BOARD_A_TREND_ATC_6220
+
diff --git a/src/mainboard/a-trend/atc-6220/Makefile.inc b/src/mainboard/a-trend/atc-6220/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/a-trend/atc-6220/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig
new file mode 100644
index 0000000000..a7268bb97a
--- /dev/null
+++ b/src/mainboard/a-trend/atc-6240/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_A_TREND_ATC_6240
+ bool "ATC-6240"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83627HF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ A-Trend ATC-6240 mainboard.
+
+config MAINBOARD_DIR
+ string
+ default a-trend/atc-6240
+ depends on BOARD_A_TREND_ATC_6240
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "ATC-6240"
+ depends on BOARD_A_TREND_ATC_6240
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_A_TREND_ATC_6240
+
+config IRQ_SLOT_COUNT
+ int
+ default 7
+ depends on BOARD_A_TREND_ATC_6240
+
diff --git a/src/mainboard/a-trend/atc-6240/Makefile.inc b/src/mainboard/a-trend/atc-6240/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/a-trend/atc-6240/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/abit/Kconfig b/src/mainboard/abit/Kconfig
index 792d600548..982cc9eee7 100644
--- a/src/mainboard/abit/Kconfig
+++ b/src/mainboard/abit/Kconfig
@@ -1 +1,28 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_ABIT
+
+source "src/mainboard/abit/be6-ii_v2_0/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig b/src/mainboard/abit/be6-ii_v2_0/Kconfig
new file mode 100644
index 0000000000..22bd50fe83
--- /dev/null
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_ABIT_BE6_II_V2_0
+ bool "BE6-II V2.0"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ Abit BE6-II V2.0 mainboard.
+
+config MAINBOARD_DIR
+ string
+ default abit/be6-ii_v2_0
+ depends on BOARD_ABIT_BE6_II_V2_0
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "BE6-II V2.0"
+ depends on BOARD_ABIT_BE6_II_V2_0
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_ABIT_BE6_II_V2_0
+
+config IRQ_SLOT_COUNT
+ int
+ default 9
+ depends on BOARD_ABIT_BE6_II_V2_0
+
diff --git a/src/mainboard/abit/be6-ii_v2_0/Makefile.inc b/src/mainboard/abit/be6-ii_v2_0/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/abit/be6-ii_v2_0/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig
index 6ada055293..ea7184db1b 100644
--- a/src/mainboard/asus/Kconfig
+++ b/src/mainboard/asus/Kconfig
@@ -22,7 +22,10 @@ choice
prompt "Mainboard model"
depends on VENDOR_ASUS
+source "src/mainboard/asus/p2b/Kconfig"
+source "src/mainboard/asus/p2b-d/Kconfig"
source "src/mainboard/asus/p2b-f/Kconfig"
+source "src/mainboard/asus/p3b-f/Kconfig"
source "src/mainboard/asus/m2v-mx_se/Kconfig"
endchoice
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
new file mode 100644
index 0000000000..111c6540cb
--- /dev/null
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -0,0 +1,62 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_ASUS_P2B_D
+ bool "P2B-D"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
+ select SMP
+ select IOAPIC
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ ASUS P2B-D mainboard.
+
+config MAINBOARD_DIR
+ string
+ default asus/p2b-d
+ depends on BOARD_ASUS_P2B_D
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "P2B-D"
+ depends on BOARD_ASUS_P2B_D
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_ASUS_P2B_D
+
+config IRQ_SLOT_COUNT
+ int
+ default 6
+ depends on BOARD_ASUS_P2B_D
+
+config MAX_CPUS
+ int
+ default 2
+ depends on BOARD_ASUS_P2B_D
+
diff --git a/src/mainboard/asus/p2b-d/Makefile.inc b/src/mainboard/asus/p2b-d/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/asus/p2b-d/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
new file mode 100644
index 0000000000..f139604ecf
--- /dev/null
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -0,0 +1,62 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_ASUS_P2B_DS
+ bool "P2B-DS"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
+ select SMP
+ select IOAPIC
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ ASUS P2B-DS mainboard.
+
+config MAINBOARD_DIR
+ string
+ default asus/p2b-ds
+ depends on BOARD_ASUS_P2B_DS
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "P2B-DS"
+ depends on BOARD_ASUS_P2B_DS
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_ASUS_P2B_DS
+
+config IRQ_SLOT_COUNT
+ int
+ default 7
+ depends on BOARD_ASUS_P2B_DS
+
+config MAX_CPUS
+ int
+ default 2
+ depends on BOARD_ASUS_P2B_DS
+
diff --git a/src/mainboard/asus/p2b-ds/Makefile.inc b/src/mainboard/asus/p2b-ds/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/asus/p2b-ds/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index 3c0f26d679..735166189d 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -37,11 +37,6 @@ config MAINBOARD_DIR
default asus/p2b-f
depends on BOARD_ASUS_P2B_F
-config MAINBOARD_VENDOR
- string
- default "ASUS"
- depends on BOARD_ASUS_P2B_F
-
config MAINBOARD_PART_NUMBER
string
default "P2B-F"
diff --git a/src/mainboard/asus/p2b-f/Makefile.inc b/src/mainboard/asus/p2b-f/Makefile.inc
index ce52ed884d..caa81b8b4e 100644
--- a/src/mainboard/asus/p2b-f/Makefile.inc
+++ b/src/mainboard/asus/p2b-f/Makefile.inc
@@ -18,37 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-initobj-y += crt0.o
-crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
-crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
-crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
-crt0-y += ../../../../src/arch/i386/lib/cpu_reset.inc
-crt0-y += ../../../../src/arch/i386/lib/id.inc
-crt0-y += failover.inc
-crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc
-crt0-y += ../../../../src/cpu/x86/mmx/enable_mmx.inc
-crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc
-
-ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds
-ldscript-y += ../../../../src/cpu/x86/32bit/entry32.lds
-ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds
-ldscript-y += ../../../../src/arch/i386/lib/id.lds
-ldscript-y += ../../../../src/arch/i386/lib/failover.lds
-
-driver-y += mainboard.o
-
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-
-ifdef POST_EVALUATION
-
-$(obj)/mainboard/$(MAINBOARDDIR)/failover.inc: $(obj)/romcc $(src)/arch/i386/lib/failover.c
- $(obj)/romcc -mcpu=p2 -O2 --label-prefix=failover $(INCLUDES) $(src)/arch/i386/lib/failover.c -o $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(obj)/romcc $(src)/mainboard/$(MAINBOARDDIR)/auto.c
- $(obj)/romcc -mcpu=p2 -O2 $(INCLUDES) $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
-
-endif
+include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
new file mode 100644
index 0000000000..5385378108
--- /dev/null
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_ASUS_P2B
+ bool "P2B"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ ASUS P2B mainboard.
+
+config MAINBOARD_DIR
+ string
+ default asus/p2b
+ depends on BOARD_ASUS_P2B
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "P2B"
+ depends on BOARD_ASUS_P2B
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_ASUS_P2B
+
+config IRQ_SLOT_COUNT
+ int
+ default 6
+ depends on BOARD_ASUS_P2B
+
diff --git a/src/mainboard/asus/p2b/Makefile.inc b/src/mainboard/asus/p2b/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/asus/p2b/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
new file mode 100644
index 0000000000..bffafbb274
--- /dev/null
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_ASUS_P3B_F
+ bool "P3B-F"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ ASUS P3B-F mainboard.
+
+config MAINBOARD_DIR
+ string
+ default asus/p3b-f
+ depends on BOARD_ASUS_P3B_F
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "P3B-F"
+ depends on BOARD_ASUS_P3B_F
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_ASUS_P3B_F
+
+config IRQ_SLOT_COUNT
+ int
+ default 8
+ depends on BOARD_ASUS_P3B_F
+
diff --git a/src/mainboard/asus/p3b-f/Makefile.inc b/src/mainboard/asus/p3b-f/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/asus/p3b-f/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/azza/Kconfig b/src/mainboard/azza/Kconfig
index 792d600548..f7109ecbf7 100644
--- a/src/mainboard/azza/Kconfig
+++ b/src/mainboard/azza/Kconfig
@@ -1 +1,28 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_AZZA
+
+source "src/mainboard/azza/pt-6ibd/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig
new file mode 100644
index 0000000000..eac53c485b
--- /dev/null
+++ b/src/mainboard/azza/pt-6ibd/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_AZZA_PT_6IBD
+ bool "PT-6IBD"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ AZZA PT-6IBD mainboard.
+
+config MAINBOARD_DIR
+ string
+ default azza/pt-6ibd
+ depends on BOARD_AZZA_PT_6IBD
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "PT-6IBD"
+ depends on BOARD_AZZA_PT_6IBD
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_AZZA_PT_6IBD
+
+config IRQ_SLOT_COUNT
+ int
+ default 7
+ depends on BOARD_AZZA_PT_6IBD
+
diff --git a/src/mainboard/azza/pt-6ibd/Makefile.inc b/src/mainboard/azza/pt-6ibd/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/azza/pt-6ibd/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig
index 792d600548..73bdfc20d8 100644
--- a/src/mainboard/biostar/Kconfig
+++ b/src/mainboard/biostar/Kconfig
@@ -1 +1,28 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_BIOSTAR
+
+source "src/mainboard/biostar/m6tba/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig
new file mode 100644
index 0000000000..0aa61b44f7
--- /dev/null
+++ b/src/mainboard/biostar/m6tba/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_BIOSTAR_M6TBA
+ bool "M6TBA"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_SMSC_SMSCSUPERIO
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ Biostar M6TBA mainboard.
+
+config MAINBOARD_DIR
+ string
+ default biostar/m6tba
+ depends on BOARD_BIOSTAR_M6TBA
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "M6TBA"
+ depends on BOARD_BIOSTAR_M6TBA
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_BIOSTAR_M6TBA
+
+config IRQ_SLOT_COUNT
+ int
+ default 7
+ depends on BOARD_BIOSTAR_M6TBA
+
diff --git a/src/mainboard/biostar/m6tba/Makefile.inc b/src/mainboard/biostar/m6tba/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/biostar/m6tba/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/compaq/Kconfig b/src/mainboard/compaq/Kconfig
index 792d600548..160048f30f 100644
--- a/src/mainboard/compaq/Kconfig
+++ b/src/mainboard/compaq/Kconfig
@@ -1 +1,28 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_COMPAQ
+
+source "src/mainboard/compaq/deskpro_en_sff_p600/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
new file mode 100644
index 0000000000..c71ae404bb
--- /dev/null
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_COMPAQ_DESKPRO_EN_SFF_P600
+ bool "Deskpro EN SFF P600"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_NSC_PC97307
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ Compaq Deskpro EN SFF P600 mainboard.
+
+config MAINBOARD_DIR
+ string
+ default compaq/deskpro_en_sff_p600
+ depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "Deskpro EN SFF P600"
+ depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600
+
+config IRQ_SLOT_COUNT
+ int
+ default 5
+ depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600
+
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc b/src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/gigabyte/Kconfig b/src/mainboard/gigabyte/Kconfig
index 792d600548..ad5003c2c5 100644
--- a/src/mainboard/gigabyte/Kconfig
+++ b/src/mainboard/gigabyte/Kconfig
@@ -1 +1,28 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_GIGABYTE
+
+source "src/mainboard/gigabyte/ga-6bxc/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig
new file mode 100644
index 0000000000..5be8118c80
--- /dev/null
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_GIGABYTE_GA_6BXC
+ bool "GA-6BXC"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_ITE_IT8671F
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ GIGABYTE GA-6BXC mainboard.
+
+config MAINBOARD_DIR
+ string
+ default gigabyte/ga-6bxc
+ depends on BOARD_GIGABYTE_GA_6BXC
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "GA-6BXC"
+ depends on BOARD_GIGABYTE_GA_6BXC
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_GIGABYTE_GA_6BXC
+
+config IRQ_SLOT_COUNT
+ int
+ default 5
+ depends on BOARD_GIGABYTE_GA_6BXC
+
diff --git a/src/mainboard/gigabyte/ga-6bxc/Makefile.inc b/src/mainboard/gigabyte/ga-6bxc/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/gigabyte/ga-6bxc/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig
index 885b15dd79..695cd7bfc6 100644
--- a/src/mainboard/msi/Kconfig
+++ b/src/mainboard/msi/Kconfig
@@ -21,22 +21,9 @@
choice
prompt "Mainboard model"
depends on VENDOR_MSI
-
-config BOARD_MSI_MS6178
- bool "MS-6178"
- select ARCH_X86
- select CPU_INTEL_SOCKET_PGA370
- select NORTHBRIDGE_INTEL_I82810
- select SOUTHBRIDGE_INTEL_I82801XX
- select SUPERIO_WINBOND_W83627HF
- select HAVE_PIRQ_TABLE
- help
- MSI MS-6178 mainboard.
+
+source "src/mainboard/msi/ms6119/Kconfig"
+source "src/mainboard/msi/ms6147/Kconfig"
endchoice
-config MAINBOARD_DIR
- string
- default msi/ms6178
- depends on BOARD_MSI_MS6178
-
diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig
new file mode 100644
index 0000000000..81cb915f86
--- /dev/null
+++ b/src/mainboard/msi/ms6119/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_MSI_MS_6119
+ bool "MS-6119"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ MSI MS-6119 mainboard.
+
+config MAINBOARD_DIR
+ string
+ default msi/ms6119
+ depends on BOARD_MSI_MS_6119
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "MS-6119"
+ depends on BOARD_MSI_MS_6119
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_MSI_MS_6119
+
+config IRQ_SLOT_COUNT
+ int
+ default 7
+ depends on BOARD_MSI_MS_6119
+
diff --git a/src/mainboard/msi/ms6119/Makefile.inc b/src/mainboard/msi/ms6119/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/msi/ms6119/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig
new file mode 100644
index 0000000000..189480803c
--- /dev/null
+++ b/src/mainboard/msi/ms6147/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_MSI_MS_6147
+ bool "MS-6147"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_WINBOND_W83977TF
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ MSI MS-6147 mainboard.
+
+config MAINBOARD_DIR
+ string
+ default msi/ms6147
+ depends on BOARD_MSI_MS_6147
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "MS-6147"
+ depends on BOARD_MSI_MS_6147
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_MSI_MS_6147
+
+config IRQ_SLOT_COUNT
+ int
+ default 8
+ depends on BOARD_MSI_MS_6147
+
diff --git a/src/mainboard/msi/ms6147/Makefile.inc b/src/mainboard/msi/ms6147/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/msi/ms6147/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/msi/ms6178/Makefile.inc b/src/mainboard/msi/ms6178/Makefile.inc
deleted file mode 100644
index bc322d4f0d..0000000000
--- a/src/mainboard/msi/ms6178/Makefile.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## 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
-##
-
-driver-y += mainboard.o
-
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-
-initobj-y += ../../../arch/i386/init/entry.o
-initobj-y += ../../../cpu/intel/model_6ex/car.o # FIXME. romcc.
-# initobj-y += ../../../arch/i386/init/rombootstrap.o
-# initobj-y += ../../../cpu/intel/model_6ex/disable_car.o
-initobj-y += ../../../pc80/mc146818rtc_early.o
-initobj-y += ../../../arch/i386/lib/console.o
-initobj-y += ../../../arch/i386/lib/console_printk.o
-# initobj-y += ../../../ram/ramtest.o # FIXME
-initobj-y += ../../../southbridge/intel/i82801xx/i82801xx_early_smbus.o
-initobj-y += ../../../southbridge/intel/i82801xx/i82801xx_reset.o
-initobj-y += ../../../superio/winbond/w83627hf/w83627hf_early_serial.o
-initobj-y += ../../../northbridge/intel/i82810/raminit.o
-
-ifdef POST_EVALUATION
-
-# FIXME: Drop DCACHE_RAM_BASE/DCACHE_RAM_SIZE, only here to make it build.
-MAINBOARD_OPTIONS=\
- -DCONFIG_USE_PRINTK_IN_CAR=1 \
- -DCONFIG_HAVE_HIGH_TABLES=1 \
- -DCONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0 \
- -DCONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0 \
- -DCONFIG_MAINBOARD_VENDOR=\"MSI\" \
- -DCONFIG_MAINBOARD_PART_NUMBER=\"MS-6178\" \
- -DCONFIG_DCACHE_RAM_BASE=0xffdf8000 \
- -DCONFIG_DCACHE_RAM_SIZE=0x8000
-
-endif
-
diff --git a/src/mainboard/soyo/Kconfig b/src/mainboard/soyo/Kconfig
index 792d600548..bb20b7475a 100644
--- a/src/mainboard/soyo/Kconfig
+++ b/src/mainboard/soyo/Kconfig
@@ -1 +1,28 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_SOYO
+
+source "src/mainboard/soyo/sy-6ba-plus-iii/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
new file mode 100644
index 0000000000..982db08031
--- /dev/null
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_SOYO_SY_6BA_PLUS_III
+ bool "SY-6BA+ III"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_ITE_IT8671F
+ select HAVE_PIRQ_TABLE
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ SOYO SY-6BA+ III mainboard.
+
+config MAINBOARD_DIR
+ string
+ default soyo/sy-6ba-plus-iii
+ depends on BOARD_SOYO_SY_6BA_PLUS_III
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "SY-6BA+ III"
+ depends on BOARD_SOYO_SY_6BA_PLUS_III
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_SOYO_SY_6BA_PLUS_III
+
+config IRQ_SLOT_COUNT
+ int
+ default 7
+ depends on BOARD_SOYO_SY_6BA_PLUS_III
+
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc b/src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+
diff --git a/src/mainboard/tyan/Kconfig b/src/mainboard/tyan/Kconfig
index 792d600548..0af78ba9d3 100644
--- a/src/mainboard/tyan/Kconfig
+++ b/src/mainboard/tyan/Kconfig
@@ -1 +1,28 @@
-#
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_TYAN
+
+source "src/mainboard/tyan/s1846/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
new file mode 100644
index 0000000000..abdd98a560
--- /dev/null
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -0,0 +1,48 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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 BOARD_TYAN_S1846
+ bool "S1846"
+ select ARCH_X86
+ select CPU_INTEL_SLOT_2
+ select NORTHBRIDGE_INTEL_I440BX
+ select SOUTHBRIDGE_INTEL_I82371EB
+ select SUPERIO_NSC_PC87309
+ select UDELAY_IO
+ select PCI_ROM_RUN
+ select CONSOLE_VGA
+ help
+ Tyan S1846 mainboard.
+
+config MAINBOARD_DIR
+ string
+ default tyan/s1846
+ depends on BOARD_TYAN_S1846
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "S1846"
+ depends on BOARD_TYAN_S1846
+
+config HAVE_OPTION_TABLE
+ bool
+ default n
+ depends on BOARD_TYAN_S1846
+
diff --git a/src/mainboard/tyan/s1846/Makefile.inc b/src/mainboard/tyan/s1846/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/tyan/s1846/Makefile.inc
@@ -0,0 +1,22 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## 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
+##
+
+include $(src)/mainboard/Makefile.romccboard.inc
+