From 37ea3410794758b8253ff5ad0e2918f760e39294 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 3 Oct 2009 21:04:13 +0000 Subject: [PATCH] Move HAVE_FAILOVER_BOOT and USE_FAILOVER_IMAGE from boards to global. It's not a per-board value, but compatibility stuff. Signed-off-by: Patrick Georgi Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4714 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/Kconfig | 8 ++++++++ src/mainboard/amd/serengeti_cheetah/Kconfig | 10 ---------- src/mainboard/dell/s1850/Kconfig | 15 --------------- src/mainboard/sunw/ultra40/Kconfig | 10 ---------- src/mainboard/supermicro/h8dme/Kconfig | 10 ---------- src/mainboard/tyan/s2850/Kconfig | 10 ---------- src/mainboard/tyan/s2875/Kconfig | 10 ---------- src/mainboard/tyan/s2881/Kconfig | 15 --------------- src/mainboard/tyan/s2891/Kconfig | 15 --------------- src/mainboard/tyan/s2892/Kconfig | 15 --------------- src/mainboard/tyan/s2895/Kconfig | 15 --------------- 11 files changed, 8 insertions(+), 125 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 67b5689098..8ff72b3804 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -146,6 +146,14 @@ config USE_FALLBACK_IMAGE bool default y +config HAVE_FAILOVER_BOOT + bool + default n + +config USE_FAILOVER_IMAGE + bool + default n + config HAVE_HARD_RESET bool default 0 diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index e94f31dcc8..f0d3a904ce 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -72,16 +72,6 @@ config MEM_TRAIN_SEQ default y depends on BOARD_AMD_SERENGETI_CHEETAH -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_AMD_SERENGETI_CHEETAH - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_AMD_SERENGETI_CHEETAH - config MAX_CPUS int default 8 diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig index 43b4d390f7..6eeef3c7aa 100644 --- a/src/mainboard/dell/s1850/Kconfig +++ b/src/mainboard/dell/s1850/Kconfig @@ -33,21 +33,6 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID 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 diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index a524d6a643..4ed5e6d290 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -76,16 +76,6 @@ config HW_MEM_HOLE_SIZEK default 0x100000 depends on BOARD_SUNW_ULTRA40 -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_SUNW_ULTRA40 - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_SUNW_ULTRA40 - config MAX_CPUS int default 4 diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig index 6bdb899d1b..e1b1e16b0f 100644 --- a/src/mainboard/supermicro/h8dme/Kconfig +++ b/src/mainboard/supermicro/h8dme/Kconfig @@ -76,16 +76,6 @@ config HW_MEM_HOLE_SIZEK default 0x100000 depends on BOARD_SUPERMICRO_H8DME -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_SUPERMICRO_H8DME - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_SUPERMICRO_H8DME - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig index 81bd092cae..101349b3e7 100644 --- a/src/mainboard/tyan/s2850/Kconfig +++ b/src/mainboard/tyan/s2850/Kconfig @@ -39,16 +39,6 @@ config HW_MEM_HOLE_SIZEK default 0x100000 depends on BOARD_TYAN_S2850 -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_TYAN_S2850 - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2850 - config MAX_CPUS int default 2 diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig index 9249428a9f..93e01c8273 100644 --- a/src/mainboard/tyan/s2875/Kconfig +++ b/src/mainboard/tyan/s2875/Kconfig @@ -40,16 +40,6 @@ config HW_MEM_HOLE_SIZEK default 0x100000 depends on BOARD_TYAN_S2875 -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_TYAN_S2875 - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2875 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig index 280ca80f16..24c6295d0b 100644 --- a/src/mainboard/tyan/s2881/Kconfig +++ b/src/mainboard/tyan/s2881/Kconfig @@ -45,11 +45,6 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID default 0x2881 depends on BOARD_TYAN_S2881 -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2881 - config HW_MEM_HOLE_SIZEK hex default 0x100000 @@ -60,16 +55,6 @@ config MEM_TRAIN_SEQ default n depends on BOARD_TYAN_S2881 -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_TYAN_S2881 - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2881 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig index 81185ff5b3..a36a1b2af3 100644 --- a/src/mainboard/tyan/s2891/Kconfig +++ b/src/mainboard/tyan/s2891/Kconfig @@ -45,11 +45,6 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID default 0x2891 depends on BOARD_TYAN_S2891 -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2891 - config HW_MEM_HOLE_SIZEK hex default 0x100000 @@ -60,16 +55,6 @@ config MEM_TRAIN_SEQ default n depends on BOARD_TYAN_S2891 -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_TYAN_S2891 - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2891 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig index 5219f1239f..49b7dba15c 100644 --- a/src/mainboard/tyan/s2892/Kconfig +++ b/src/mainboard/tyan/s2892/Kconfig @@ -45,11 +45,6 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID default 0x2892 depends on BOARD_TYAN_S2892 -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2892 - config HW_MEM_HOLE_SIZEK hex default 0x100000 @@ -60,16 +55,6 @@ config MEM_TRAIN_SEQ default n depends on BOARD_TYAN_S2892 -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_TYAN_S2892 - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2892 - config MAX_CPUS int default 4 diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig index cd4690741d..7d5981dde1 100644 --- a/src/mainboard/tyan/s2895/Kconfig +++ b/src/mainboard/tyan/s2895/Kconfig @@ -45,11 +45,6 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID default 0x2895 depends on BOARD_TYAN_S2895 -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2895 - config HW_MEM_HOLE_SIZEK hex default 0x100000 @@ -60,16 +55,6 @@ config MEM_TRAIN_SEQ default n depends on BOARD_TYAN_S2895 -config HAVE_FAILOVER_BOOT - bool - default n - depends on BOARD_TYAN_S2895 - -config USE_FAILOVER_IMAGE - bool - default n - depends on BOARD_TYAN_S2895 - config MAX_CPUS int default 4