diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-17 02:09:12 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-17 02:09:12 +0000 |
| commit | d4ab7c5efbe3e8bc398dd541465bbfc5efe37035 (patch) | |
| tree | 813cf5f9e46b052e59e973e1e6bb72b901bb06b8 | |
| parent | 348a1ba589c784f8b15d7179b2d9488c2c31ccb6 (diff) | |
| download | coreboot-d4ab7c5efbe3e8bc398dd541465bbfc5efe37035.tar.xz | |
fix dell s1850, ROMCC didn't seem to like SSE2 memtest here.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5237 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/cpu/intel/model_f0x/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/intel/model_f1x/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/intel/model_f2x/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/intel/model_f3x/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/intel/model_f4x/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/intel/socket_mPGA604/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/dell/s1850/Kconfig | 1 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ex/i82801ex_watchdog.c | 1 |
8 files changed, 10 insertions, 5 deletions
diff --git a/src/cpu/intel/model_f0x/Kconfig b/src/cpu/intel/model_f0x/Kconfig index bf26cfe048..9dd7fd0bdc 100644 --- a/src/cpu/intel/model_f0x/Kconfig +++ b/src/cpu/intel/model_f0x/Kconfig @@ -1,4 +1,3 @@ config CPU_INTEL_MODEL_F0X bool select SMP - select SSE2 diff --git a/src/cpu/intel/model_f1x/Kconfig b/src/cpu/intel/model_f1x/Kconfig index 328930cb8c..ea75857949 100644 --- a/src/cpu/intel/model_f1x/Kconfig +++ b/src/cpu/intel/model_f1x/Kconfig @@ -1,4 +1,3 @@ config CPU_INTEL_MODEL_F1X bool select SMP - select SSE2 diff --git a/src/cpu/intel/model_f2x/Kconfig b/src/cpu/intel/model_f2x/Kconfig index 1672fda7e9..50cac7937c 100644 --- a/src/cpu/intel/model_f2x/Kconfig +++ b/src/cpu/intel/model_f2x/Kconfig @@ -1,4 +1,3 @@ config CPU_INTEL_MODEL_F2X bool select SMP - select SSE2 diff --git a/src/cpu/intel/model_f3x/Kconfig b/src/cpu/intel/model_f3x/Kconfig index 1a2fa36922..4cfca83dc6 100644 --- a/src/cpu/intel/model_f3x/Kconfig +++ b/src/cpu/intel/model_f3x/Kconfig @@ -1,4 +1,3 @@ config CPU_INTEL_MODEL_F3X bool select SMP - select SSE2 diff --git a/src/cpu/intel/model_f4x/Kconfig b/src/cpu/intel/model_f4x/Kconfig index e765e335d6..97c909a0ae 100644 --- a/src/cpu/intel/model_f4x/Kconfig +++ b/src/cpu/intel/model_f4x/Kconfig @@ -1,4 +1,3 @@ config CPU_INTEL_MODEL_F4X bool select SMP - select SSE2 diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig index 2668174e71..faa74d3390 100644 --- a/src/cpu/intel/socket_mPGA604/Kconfig +++ b/src/cpu/intel/socket_mPGA604/Kconfig @@ -6,3 +6,11 @@ config CPU_INTEL_SOCKET_MPGA604 select MMX select SSE select UDELAY_TSC + +# mPGA604 are usually Intel Netburst CPUs which should have SSE2 +# but the ramtest.c code on the Dell S1850 seems to choke on +# enabling it, so disable it for now. +config SSE2 + bool + default n + depends on CPU_INTEL_SOCKET_MPGA604 diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig index 853e2ab7a5..112abb54c1 100644 --- a/src/mainboard/dell/s1850/Kconfig +++ b/src/mainboard/dell/s1850/Kconfig @@ -11,6 +11,7 @@ config BOARD_DELL_S1850 select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE + select USE_WATCHDOG_ON_BOOT select BOARD_ROMSIZE_KB_1024 select UDELAY_TSC diff --git a/src/southbridge/intel/i82801ex/i82801ex_watchdog.c b/src/southbridge/intel/i82801ex/i82801ex_watchdog.c index c9c09f5896..44a701823a 100644 --- a/src/southbridge/intel/i82801ex/i82801ex_watchdog.c +++ b/src/southbridge/intel/i82801ex/i82801ex_watchdog.c @@ -1,4 +1,5 @@ #include <console/console.h> +#include <watchdog.h> #include <arch/io.h> #include <device/device.h> #include <device/pci.h> |