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 <patrick.georgi@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4714 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index 67b56890988a79be4a85823810e4d706ed5324b8..8ff72b38046e3ffc62e957e43007aaf7319eb914 100644 (file)
--- 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 e94f31dcc883464b4d94db210a94b7cd3f6186e7..f0d3a904ced3f52395dc93317f0761c10857a318 100644 (file)
--- 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 43b4d390f7d6f41843f3546ef5541525ce25d495..6eeef3c7aa5e959a4657ff95a32b637821f05193 100644 (file)
--- 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 a524d6a64338ae4bb42b39561464918b6d3e4755..4ed5e6d2908619fd162b530b4def48e29b28d7a9 100644 (file)
--- 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 6bdb899d1bbdc9321afa8d807a4a51a1abc9211a..e1b1e16b0fb29db1f8afc7c83954bb2c5cd989aa 100644 (file)
--- 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 81bd092cae66a19f7dcdd84455aa8eb31df3b037..101349b3e778d58580ca3b5f9a72c63abf3c43d3 100644 (file)
--- 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 9249428a9f157e2cc7a2066aa28e672afbae34ef..93e01c8273ecf9bc212b4edb88aa09e9e14aa12d 100644 (file)
--- 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 280ca80f16f32cbfc411372cfeb0e86a27835b8b..24c6295d0b08e89a17c7e399b2fd70a932640980 100644 (file)
--- 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 81185ff5b37cb5cc2163c1de304c83b717bb7bdf..a36a1b2af3b35657ebd901d161f53c1d07de29d9 100644 (file)
--- 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 5219f1239f9b19d019aee6a0bf74e321f1b08415..49b7dba15cab2f4ae4353afdd98514697d07a5eb 100644 (file)
--- 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 cd4690741d1582f8e52b84e9b548f635fe207631..7d5981dde1a2f121eaa14681557c37818e51624c 100644 (file)
--- 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