[coreboot-gerrit] New patch to review for coreboot: 5e4641b boards: remove VBOOT_(REFCODE|RAMSTAGE|ROMSTAGE)_INDEX
Aaron Durbin (adurbin@chromium.org)
gerrit at coreboot.org
Wed Apr 22 17:53:11 CEST 2015
Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9959
-gerrit
commit 5e4641b0f9f879feb01f7bd646ff14dc4739ac38
Author: Aaron Durbin <adurbin at chromium.org>
Date: Wed Apr 22 10:48:01 2015 -0500
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 at chromium.org>
---
src/mainboard/google/bolt/Kconfig | 4 ----
src/mainboard/google/cosmos/Kconfig | 4 ----
src/mainboard/google/falco/Kconfig | 4 ----
src/mainboard/google/nyan/Kconfig | 4 ----
src/mainboard/google/nyan_big/Kconfig | 4 ----
src/mainboard/google/nyan_blaze/Kconfig | 4 ----
src/mainboard/google/panther/Kconfig | 4 ----
src/mainboard/google/peppy/Kconfig | 4 ----
src/mainboard/google/rambi/Kconfig | 8 --------
src/mainboard/google/rush/Kconfig | 7 -------
src/mainboard/google/rush_ryu/Kconfig | 7 -------
src/mainboard/google/samus/Kconfig | 8 --------
src/mainboard/google/slippy/Kconfig | 4 ----
src/mainboard/google/veyron_brain/Kconfig | 11 -----------
src/mainboard/google/veyron_danger/Kconfig | 11 -----------
src/mainboard/google/veyron_jerry/Kconfig | 4 ----
src/mainboard/google/veyron_mighty/Kconfig | 4 ----
src/mainboard/google/veyron_pinky/Kconfig | 4 ----
src/mainboard/google/veyron_rialto/Kconfig | 11 -----------
src/mainboard/google/veyron_speedy/Kconfig | 4 ----
src/mainboard/intel/wtm2/Kconfig | 8 --------
21 files changed, 123 deletions(-)
diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig
index 5ffbb8d..265c0f5 100644
--- a/src/mainboard/google/bolt/Kconfig
+++ b/src/mainboard/google/bolt/Kconfig
@@ -20,10 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MONOTONIC_TIMER_MSR
select INTEL_INT15
-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 49d3172..c0be34d 100644
--- a/src/mainboard/google/cosmos/Kconfig
+++ b/src/mainboard/google/cosmos/Kconfig
@@ -45,10 +45,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 d8dc21e..9ad3e61 100644
--- a/src/mainboard/google/falco/Kconfig
+++ b/src/mainboard/google/falco/Kconfig
@@ -23,10 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_DO_NATIVE_VGA_INIT
select INTEL_INT15
-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 2f554ff..57f51d6 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -80,10 +80,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 555f863..e999ee9 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/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_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index e5ccbde..34a414b 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -82,10 +82,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 5f2efb9..32d6841 100644
--- a/src/mainboard/google/panther/Kconfig
+++ b/src/mainboard/google/panther/Kconfig
@@ -20,10 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
select PHYSICAL_REC_SWITCH
-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 308b843..9aba6d3 100644
--- a/src/mainboard/google/peppy/Kconfig
+++ b/src/mainboard/google/peppy/Kconfig
@@ -25,10 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_DDI
select INTEL_INT15
-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 e3f5bef..2e2faca 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -14,14 +14,6 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_CHROMEOS
select ALWAYS_LOAD_OPROM
-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 df6ac57..5035ff4 100644
--- a/src/mainboard/google/rush/Kconfig
+++ b/src/mainboard/google/rush/Kconfig
@@ -81,13 +81,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 e069ebc..ac46e49 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -78,13 +78,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 d3623bb..62fe248 100644
--- a/src/mainboard/google/samus/Kconfig
+++ b/src/mainboard/google/samus/Kconfig
@@ -20,14 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select CHROMEOS_RAMOOPS_DYNAMIC
select INTEL_INT15
-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 42764a6..bda81bf 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -22,10 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_DDI
select INTEL_INT15
-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 ea75067..fa40443 100644
--- a/src/mainboard/google/veyron_brain/Kconfig
+++ b/src/mainboard/google/veyron_brain/Kconfig
@@ -48,17 +48,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 f6e0060..d65a6c0 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 be0b736..f025829 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 58972ad..4cccbb5 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 87d24f0..c30039c 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 597dd19..dc7d045 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 6a51457..1729b64 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
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index 7b4565f..e7fc3f3 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -15,14 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select CHROMEOS_RAMOOPS_DYNAMIC
-config VBOOT_RAMSTAGE_INDEX
- hex
- default 0x1
-
-config VBOOT_REFCODE_INDEX
- hex
- default 0x2
-
config MAINBOARD_DIR
string
default intel/wtm2
More information about the coreboot-gerrit
mailing list