9 files changed, 0 insertions, 52 deletions
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index c5a4ef4026..b812674c2e 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -21,14 +21,6 @@ config CHROMEOS
 	select EC_SOFTWARE_SYNC
 	select VIRTUAL_DEV_SWITCH
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-
-config VBOOT_REFCODE_INDEX
-	hex
-	default 0x3
-
 config MAINBOARD_DIR
 	string
 	default google/auron
diff --git a/src/mainboard/google/chell/Kconfig b/src/mainboard/google/chell/Kconfig
index f09198ff8a..5773413a08 100644
--- a/src/mainboard/google/chell/Kconfig
+++ b/src/mainboard/google/chell/Kconfig
@@ -55,8 +55,4 @@ config TPM_PIRQ
 	hex
 	default 0x18  # GPP_E0_IRQ
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 endif
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index f843a9ea5b..2ad3552a4c 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -76,13 +76,6 @@ config BOOT_MEDIA_SPI_CHIP_SELECT
 	help
 	  Which chip select to use for boot media.
 
-# For foster, 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/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 029aa1b89b..1bea9fda59 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -55,8 +55,4 @@ config TPM_PIRQ
 	hex
 	default 0x18  # GPP_E0_IRQ
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 endif
diff --git a/src/mainboard/google/lars/Kconfig b/src/mainboard/google/lars/Kconfig
index 70e6726a3a..58391ae59b 100644
--- a/src/mainboard/google/lars/Kconfig
+++ b/src/mainboard/google/lars/Kconfig
@@ -50,8 +50,4 @@ config MAX_CPUS
 	int
 	default 8
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 endif
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 576a2f8db3..a23a0d33d7 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -83,17 +83,6 @@ config BOOT_MEDIA_SPI_CHIP_SELECT
 	help
 	  Which chip select to use for boot media.
 
-# For smaug, we are using vboot2. Thus, index for stages:
-# VBOOT_ROMSTAGE_INDEX -> Use default value of 0x2
-# VBOOT_RAMSTAGE_INDEX -> Use 0x3
-config VBOOT_BL31_INDEX
-	hex
-	default 0x4
-
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x2
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index 5a5b3cdc85..81c18f554b 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -50,8 +50,4 @@ config MAX_CPUS
 	int
 	default 8
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 endif
diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig
index 73b866a3f6..e6dd86b4b0 100644
--- a/src/mainboard/intel/sklrvp/Kconfig
+++ b/src/mainboard/intel/sklrvp/Kconfig
@@ -40,8 +40,4 @@ config MAX_CPUS
 	int
 	default 8
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x3
-
 endif
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 364e242ffc..facd97f7e7 100755
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -47,12 +47,6 @@ config MAINBOARD_VENDOR
 	string
 	default "Intel"
 
-config VBOOT_RAMSTAGE_INDEX
-	hex
-	default 0x2
-config VBOOT_REFCODE_INDEX
-	hex
-	default 0x3
 if !GOP_SUPPORT
 config VGA_BIOS_FILE
 	string