Author: rminnich Date: 2009-10-01 17:41:39 +0200 (Thu, 01 Oct 2009) New Revision: 4699
Added: trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc Modified: trunk/coreboot-v2/src/mainboard/dell/Kconfig trunk/coreboot-v2/src/mainboard/dell/s1850/failover.c Log: 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
Modified: trunk/coreboot-v2/src/mainboard/dell/Kconfig =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/Kconfig 2009-10-01 00:02:28 UTC (rev 4698) +++ trunk/coreboot-v2/src/mainboard/dell/Kconfig 2009-10-01 15:41:39 UTC (rev 4699) @@ -1 +1,8 @@ -# +choice + prompt "Mainboard model" + depends on VENDOR_DELL + +source "src/mainboard/dell/s1850/Kconfig" + +endchoice +
Added: trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig (rev 0) +++ trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig 2009-10-01 15:41:39 UTC (rev 4699) @@ -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 +
Added: trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc (rev 0) +++ trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc 2009-10-01 15:41:39 UTC (rev 4699) @@ -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 +
Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/failover.c =================================================================== --- trunk/coreboot-v2/src/mainboard/dell/s1850/failover.c 2009-10-01 00:02:28 UTC (rev 4698) +++ trunk/coreboot-v2/src/mainboard/dell/s1850/failover.c 2009-10-01 15:41:39 UTC (rev 4699) @@ -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()) {