boards: remove VBOOT_(REFCODE|RAMSTAGE|ROMSTAGE)_INDEX

These options will need to just be selected in within
the .config files. There's not need in duplicating all
these options.

Change-Id: I7b670bc59a3b35e39eee4faecaf4aa779d47a3bb
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9959
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

20 files changed, 0 insertions, 115 deletions

diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig
index d575d266a9..c901b8f6dd 100644
--- a/src/mainboard/google/bolt/Kconfig
+++ b/src/mainboard/google/bolt/Kconfig
@@ -21,10 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_INT15
 	select CHROMEOS_VBNV_CMOS
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
 config MAINBOARD_DIR
 	string
 	default google/bolt
diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig
index 8cd9983c48..99d8a64f6b 100644
--- a/src/mainboard/google/cosmos/Kconfig
+++ b/src/mainboard/google/cosmos/Kconfig
@@ -44,10 +44,6 @@ config MAINBOARD_VENDOR
 	string
 	default "Google"
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config BOOT_MEDIA_SPI_BUS
 	int
 	default 2
diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig
index 683712e495..c836110f35 100644
--- a/src/mainboard/google/falco/Kconfig
+++ b/src/mainboard/google/falco/Kconfig
@@ -24,10 +24,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_INT15
 	select CHROMEOS_VBNV_CMOS
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
 config MAINBOARD_DIR
 	string
 	default google/falco
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 58edf6126b..a91eddd2c2 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -81,10 +81,6 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS
 	hex
 	default 1
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
 config FLASHMAP_OFFSET
 	hex
 	default 0x00100000
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index 555b5d1086..9aac110bde 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -82,10 +82,6 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS
 	hex
 	default 1
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
 config FLASHMAP_OFFSET
 	hex
 	default 0x00100000
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 3b7c555f58..d7d92d6b20 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -83,10 +83,6 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS
 	hex
 	default 1
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config FLASHMAP_OFFSET
 	hex
 	default 0x00100000
diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig
index 76c1a12850..6fdb46c303 100644
--- a/src/mainboard/google/panther/Kconfig
+++ b/src/mainboard/google/panther/Kconfig
@@ -21,10 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select PHYSICAL_REC_SWITCH
 	select CHROMEOS_VBNV_CMOS
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x1
-
 config MAINBOARD_DIR
 	string
 	default google/panther
diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig
index ea7c334a60..05234d0eb2 100644
--- a/src/mainboard/google/peppy/Kconfig
+++ b/src/mainboard/google/peppy/Kconfig
@@ -26,10 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_INT15
 	select CHROMEOS_VBNV_CMOS
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
 config MAINBOARD_DIR
 	string
 	default google/peppy
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 1461539ce4..4c9e89144c 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -15,14 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select ALWAYS_LOAD_OPROM
 	select CHROMEOS_VBNV_CMOS
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
-config VBOOT_REFCODE_INDEX
-	hex
-	default 0x3
-
 config MAINBOARD_DIR
 	string
 	default google/rambi
diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig
index cb6da1ce68..9cb0223236 100644
--- a/src/mainboard/google/rush/Kconfig
+++ b/src/mainboard/google/rush/Kconfig
@@ -82,13 +82,6 @@ config BOOT_MEDIA_SPI_CHIP_SELECT
 	help
 	  Which chip select to use for boot media.
 
-# For rush, we are using vboot2. Thus, index for stages:
-# VBOOT_ROMSTAGE_INDEX -> Use default value of 0x2
-# VBOOT_RAMSTAGE_INDEX -> Use 0x3
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x2
diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig
index 2961cbec14..2a7e0fb87d 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -79,13 +79,6 @@ config BOOT_MEDIA_SPI_CHIP_SELECT
 	help
 	  Which chip select to use for boot media.
 
-# For ryu, we are using vboot2. Thus, index for stages:
-# VBOOT_ROMSTAGE_INDEX -> Use default value of 0x2
-# VBOOT_RAMSTAGE_INDEX -> Use 0x3
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x2
diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig
index ee28b3c7ce..664faf1b98 100644
--- a/src/mainboard/google/samus/Kconfig
+++ b/src/mainboard/google/samus/Kconfig
@@ -21,14 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_INT15
 	select CHROMEOS_VBNV_CMOS
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
-config VBOOT_REFCODE_INDEX
-	hex
-	default 0x4
-
 config MAINBOARD_DIR
 	string
 	default google/samus
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 0b1976ac63..48e58257b7 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -23,10 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select INTEL_INT15
 	select CHROMEOS_VBNV_CMOS
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
 config MAINBOARD_DIR
 	string
 	default google/slippy
diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig
index bea618cd4b..c5ff0bbbfe 100644
--- a/src/mainboard/google/veyron_brain/Kconfig
+++ b/src/mainboard/google/veyron_brain/Kconfig
@@ -49,17 +49,6 @@ config MAINBOARD_VENDOR
 	string
 	default "Google"
 
-# The 'ecrwhash' is removed from FMAP on Brain, since we don't have EC.
-# As a result, we have to hack RAMSTAGE and ROMSTAGE index until there are
-# better approaches for vboot2 to find right index.
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
-config VBOOT_ROMSTAGE_INDEX
-	hex
-	default 0x1
-
 config BOOT_MEDIA_SPI_BUS
         int
         default 2
diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig
index f6e0060398..d65a6c0b7f 100644
--- a/src/mainboard/google/veyron_danger/Kconfig
+++ b/src/mainboard/google/veyron_danger/Kconfig
@@ -49,17 +49,6 @@ config MAINBOARD_VENDOR
 	string
 	default "Google"
 
-# The 'ecrwhash' is removed from FMAP on Danger, since we don't have EC.
-# As a result, we have to hack RAMSTAGE and ROMSTAGE index until there are
-# better approaches for vboot2 to find right index.
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
-config VBOOT_ROMSTAGE_INDEX
-	hex
-	default 0x1
-
 config BOOT_MEDIA_SPI_BUS
         int
         default 2
diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig
index be0b73633c..f025829cf2 100644
--- a/src/mainboard/google/veyron_jerry/Kconfig
+++ b/src/mainboard/google/veyron_jerry/Kconfig
@@ -60,10 +60,6 @@ config EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US
 	int
 	default 100
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config BOOT_MEDIA_SPI_BUS
         int
         default 2
diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig
index 58972ad5f7..4cccbb516f 100644
--- a/src/mainboard/google/veyron_mighty/Kconfig
+++ b/src/mainboard/google/veyron_mighty/Kconfig
@@ -60,10 +60,6 @@ config EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US
 	int
 	default 100
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config BOOT_MEDIA_SPI_BUS
         int
         default 2
diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig
index 87d24f03ea..c30039c5b9 100644
--- a/src/mainboard/google/veyron_pinky/Kconfig
+++ b/src/mainboard/google/veyron_pinky/Kconfig
@@ -60,10 +60,6 @@ config EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US
 	int
 	default 100
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config BOOT_MEDIA_SPI_BUS
         int
         default 2
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 597dd19634..dc7d0459ad 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -48,17 +48,6 @@ config MAINBOARD_VENDOR
 	string
 	default "Google"
 
-# The 'ecrwhash' is removed from FMAP on Rialto, since we don't have EC.
-# As a result, we have to hack RAMSTAGE and ROMSTAGE index until there are
-# better approaches for vboot2 to find right index.
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
-config VBOOT_ROMSTAGE_INDEX
-	hex
-	default 0x1
-
 config BOOT_MEDIA_SPI_BUS
         int
         default 2
diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig
index 6a51457a2d..1729b64991 100644
--- a/src/mainboard/google/veyron_speedy/Kconfig
+++ b/src/mainboard/google/veyron_speedy/Kconfig
@@ -60,10 +60,6 @@ config EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US
 	int
 	default 100
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config BOOT_MEDIA_SPI_BUS
         int
         default 2