summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2009-10-01 15:41:39 +0000
committerRonald G. Minnich <rminnich@gmail.com>2009-10-01 15:41:39 +0000
commite14f58343bc4f6b63673e3e2af8f6ce66d0bb74c (patch)
treee77c8c8d83046d529c7a0ed7f3fdb5c711998a1d
parent61d66db14d9f8790982a299314101e8c5125c36d (diff)
downloadcoreboot-e14f58343bc4f6b63673e3e2af8f6ce66d0bb74c.tar.xz
We need this to be Kconfig. The old way is not trusted by me.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4699 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/mainboard/dell/Kconfig9
-rw-r--r--src/mainboard/dell/s1850/Kconfig66
-rw-r--r--src/mainboard/dell/s1850/Makefile.inc22
-rw-r--r--src/mainboard/dell/s1850/failover.c2
4 files changed, 98 insertions, 1 deletions
diff --git a/src/mainboard/dell/Kconfig b/src/mainboard/dell/Kconfig
index 792d600548..92fe3de9a5 100644
--- a/src/mainboard/dell/Kconfig
+++ b/src/mainboard/dell/Kconfig
@@ -1 +1,8 @@
-#
+choice
+ prompt "Mainboard model"
+ depends on VENDOR_DELL
+
+source "src/mainboard/dell/s1850/Kconfig"
+
+endchoice
+
diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig
new file mode 100644
index 0000000000..3898c83f9b
--- /dev/null
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -0,0 +1,66 @@
+config BOARD_DELL_S1850
+ bool "Dell S1850"
+ select ARCH_X86
+ select CPU_INTEL_SOCKET_MPGA604
+ select NORTHBRIDGE_INTEL_E7520
+ select SOUTHBRIDGE_INTEL_I82801ER
+ select SUPERIO_NSC_PC8374
+ select PIRQ_TABLE
+ help
+ Dell S1850mainboard.
+
+config MAINBOARD_DIR
+ string
+ default dell/s1850
+ depends on BOARD_DELL_S1850
+
+config LB_CKS_RANGE_END
+ int
+ default 122
+ depends on BOARD_TYAN_S2881
+
+config LB_CKS_LOC
+ int
+ default 123
+ depends on BOARD_TYAN_S2881
+
+config MAINBOARD_PART_NUMBER
+ string
+ default "s1850"
+ depends on BOARD_DELL_S1850
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+ hex
+ default 0x016c
+ depends on BOARD_DELL_S1850
+
+config USE_FAILOVER_IMAGE
+ bool
+ default n
+ depends on BOARD_DELL_S1850
+
+config HAVE_FAILOVER_BOOT
+ bool
+ default n
+ depends on BOARD_DELL_S1850
+
+config USE_FAILOVER_IMAGE
+ bool
+ default n
+ depends on BOARD_DELL_S1850
+
+config MAX_CPUS
+ int
+ default 2
+ depends on BOARD_DELL_S1850
+
+config MAX_PHYSICAL_CPUS
+ int
+ default 2
+ depends on BOARD_DELL_S1850
+
+config USE_INIT
+ bool
+ default n
+ depends on BOARD_DELL_S1850
+
diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc
new file mode 100644
index 0000000000..caa81b8b4e
--- /dev/null
+++ b/src/mainboard/dell/s1850/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/dell/s1850/failover.c b/src/mainboard/dell/s1850/failover.c
index c5f3f8089d..d41bbe5eb2 100644
--- a/src/mainboard/dell/s1850/failover.c
+++ b/src/mainboard/dell/s1850/failover.c
@@ -13,6 +13,8 @@
static unsigned long main(unsigned long bist)
{
+ /* skip all this nonsense as we are not doing fallback yet */
+ goto fallback_image;
/* Did just the cpu reset? */
if (memory_initialized()) {
if (last_boot_normal()) {