summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/auron/Kconfig2
-rw-r--r--src/mainboard/google/auron/chromeos.c1
-rw-r--r--src/mainboard/google/beltino/Kconfig1
-rw-r--r--src/mainboard/google/beltino/chromeos.c6
-rw-r--r--src/mainboard/google/butterfly/chromeos.c25
-rw-r--r--src/mainboard/google/chell/chromeos.c1
-rw-r--r--src/mainboard/google/cosmos/chromeos.c5
-rw-r--r--src/mainboard/google/cyan/Kconfig2
-rw-r--r--src/mainboard/google/cyan/chromeos.c1
-rw-r--r--src/mainboard/google/daisy/chromeos.c13
-rw-r--r--src/mainboard/google/eve/chromeos.c1
-rw-r--r--src/mainboard/google/fizz/chromeos.c1
-rw-r--r--src/mainboard/google/foster/Kconfig1
-rw-r--r--src/mainboard/google/foster/chromeos.c13
-rw-r--r--src/mainboard/google/gale/Kconfig1
-rw-r--r--src/mainboard/google/gale/chromeos.c8
-rw-r--r--src/mainboard/google/glados/chromeos.c1
-rw-r--r--src/mainboard/google/gru/Kconfig2
-rw-r--r--src/mainboard/google/jecht/Kconfig1
-rw-r--r--src/mainboard/google/jecht/chromeos.c6
-rw-r--r--src/mainboard/google/lars/chromeos.c1
-rw-r--r--src/mainboard/google/link/chromeos.c6
-rw-r--r--src/mainboard/google/nyan/Kconfig2
-rw-r--r--src/mainboard/google/nyan/chromeos.c1
-rw-r--r--src/mainboard/google/nyan_big/Kconfig2
-rw-r--r--src/mainboard/google/nyan_big/chromeos.c1
-rw-r--r--src/mainboard/google/nyan_blaze/Kconfig2
-rw-r--r--src/mainboard/google/nyan_blaze/chromeos.c1
-rw-r--r--src/mainboard/google/oak/Kconfig2
-rw-r--r--src/mainboard/google/oak/chromeos.c1
-rw-r--r--src/mainboard/google/parrot/chromeos.c22
-rw-r--r--src/mainboard/google/peach_pit/chromeos.c13
-rw-r--r--src/mainboard/google/poppy/chromeos.c1
-rw-r--r--src/mainboard/google/purin/chromeos.c5
-rw-r--r--src/mainboard/google/rambi/Kconfig2
-rw-r--r--src/mainboard/google/rambi/chromeos.c1
-rw-r--r--src/mainboard/google/reef/chromeos.c1
-rw-r--r--src/mainboard/google/rotor/chromeos.c5
-rw-r--r--src/mainboard/google/slippy/Kconfig2
-rw-r--r--src/mainboard/google/slippy/chromeos.c1
-rw-r--r--src/mainboard/google/smaug/Kconfig2
-rw-r--r--src/mainboard/google/smaug/chromeos.c1
-rw-r--r--src/mainboard/google/storm/Kconfig1
-rw-r--r--src/mainboard/google/storm/chromeos.c6
-rw-r--r--src/mainboard/google/stout/chromeos.c12
-rw-r--r--src/mainboard/google/urara/chromeos.c6
-rw-r--r--src/mainboard/google/veyron/Kconfig2
-rw-r--r--src/mainboard/google/veyron/chromeos.c6
-rw-r--r--src/mainboard/google/veyron_mickey/Kconfig1
-rw-r--r--src/mainboard/google/veyron_mickey/chromeos.c6
-rw-r--r--src/mainboard/google/veyron_rialto/Kconfig1
-rw-r--r--src/mainboard/google/veyron_rialto/chromeos.c6
-rw-r--r--src/mainboard/intel/baskingridge/chromeos.c16
-rw-r--r--src/mainboard/intel/emeraldlake2/chromeos.c12
-rw-r--r--src/mainboard/intel/galileo/vboot.c5
-rw-r--r--src/mainboard/intel/kblrvp/chromeos.c7
-rw-r--r--src/mainboard/intel/kunimitsu/chromeos.c1
-rw-r--r--src/mainboard/intel/strago/Kconfig2
-rw-r--r--src/mainboard/intel/strago/chromeos.c1
-rw-r--r--src/mainboard/intel/wtm2/chromeos.c9
-rw-r--r--src/mainboard/samsung/lumpy/Kconfig2
-rw-r--r--src/mainboard/samsung/stumpy/Kconfig1
-rw-r--r--src/soc/intel/apollolake/Kconfig2
-rw-r--r--src/soc/intel/skylake/Kconfig2
-rw-r--r--src/vboot/bootmode.c3
-rw-r--r--src/vboot/vboot_handoff.c2
-rw-r--r--src/vboot/vboot_logic.c2
-rw-r--r--src/vendorcode/google/chromeos/Kconfig19
-rw-r--r--src/vendorcode/google/chromeos/chromeos.c6
69 files changed, 17 insertions, 289 deletions
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 00b4be88f7..41c9a7cf1b 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -17,10 +17,8 @@ if BOARD_GOOGLE_BASEBOARD_AURON
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select LID_SWITCH
select VBOOT_VBNV_CMOS
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c
index 61b3e4ef1e..3355136a29 100644
--- a/src/mainboard/google/auron/chromeos.c
+++ b/src/mainboard/google/auron/chromeos.c
@@ -28,7 +28,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{CROS_WP_GPIO, ACTIVE_HIGH, 0, "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index c43001838a..bceb8fb74b 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -18,7 +18,6 @@ if BOARD_GOOGLE_BASEBOARD_BELTINO
config CHROMEOS
select PHYSICAL_REC_SWITCH
select VBOOT_VBNV_CMOS
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 4ee6810c8d..7412c62ab0 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -38,7 +38,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{GPIO_SPI_WP, ACTIVE_HIGH, 0, "write protect"},
{GPIO_REC_MODE, ACTIVE_LOW,
get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, 1, "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
@@ -58,11 +57,6 @@ int get_write_protect_state(void)
return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1;
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
device_t dev;
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index b2e3356ee3..42f61896ea 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -29,7 +29,6 @@
#define WP_GPIO 6
#define DEVMODE_GPIO 54
#define FORCE_RECOVERY_MODE 0
-#define FORCE_DEVELOPER_MODE 0
#ifndef __PRE_RAM__
#include <boot/coreboot_tables.h>
@@ -61,13 +60,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
gpios->gpios[1].value = get_recovery_mode_switch();
strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
- /* Developer: virtual GPIO active high */
- gpios->gpios[2].port = -1;
- gpios->gpios[2].polarity = ACTIVE_HIGH;
- gpios->gpios[2].value = get_developer_mode_switch();
- strncpy((char *)gpios->gpios[2].name,"developer",
- GPIO_MAX_NAME_LENGTH);
-
/* lid switch value from EC */
gpios->gpios[3].port = -1;
gpios->gpios[3].polarity = ACTIVE_HIGH;
@@ -101,23 +93,6 @@ int get_lid_switch(void)
return (ec_mem_read(EC_HW_GPI_STATUS) >> EC_GPI_LID_STAT_BIT) & 1;
}
-int get_developer_mode_switch(void)
-{
- int dev_mode = 0;
-
-#if FORCE_DEVELOPER_MODE
- printk(BIOS_DEBUG,"FORCING DEVELOPER MODE.\n");
- return 1;
-#endif
-
- /* Servo GPIO is active low, reverse it for intial state (request) */
- dev_mode = !get_gpio(DEVMODE_GPIO);
- printk(BIOS_DEBUG,"DEVELOPER MODE FROM GPIO %d: %x\n",DEVMODE_GPIO,
- dev_mode);
-
- return dev_mode;
-}
-
int get_recovery_mode_switch(void)
{
int ec_rec_mode = 0;
diff --git a/src/mainboard/google/chell/chromeos.c b/src/mainboard/google/chell/chromeos.c
index fdd148611e..3ff52d918e 100644
--- a/src/mainboard/google/chell/chromeos.c
+++ b/src/mainboard/google/chell/chromeos.c
@@ -30,7 +30,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/cosmos/chromeos.c b/src/mainboard/google/cosmos/chromeos.c
index a405cf0220..d43daa2937 100644
--- a/src/mainboard/google/cosmos/chromeos.c
+++ b/src/mainboard/google/cosmos/chromeos.c
@@ -20,11 +20,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
return 0;
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 6b9d5a286f..424c08fa34 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -17,10 +17,8 @@ config BOARD_SPECIFIC_OPTIONS
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select LID_SWITCH
select VBOOT_VBNV_CMOS
- select VIRTUAL_DEV_SWITCH
config DISPLAY_SPD_DATA
bool "Display Memory Serial Presence Detect Data"
diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 672bc9708d..8aac84f57f 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -35,7 +35,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c
index 452b728b79..dcac865b41 100644
--- a/src/mainboard/google/daisy/chromeos.c
+++ b/src/mainboard/google/daisy/chromeos.c
@@ -59,25 +59,12 @@ void fill_lb_gpios(struct lb_gpios *gpios)
GPIO_MAX_NAME_LENGTH);
count++;
- /* Developer: virtual GPIO active high */
- gpios->gpios[count].port = -1;
- gpios->gpios[count].polarity = ACTIVE_HIGH;
- gpios->gpios[count].value = get_developer_mode_switch();
- strncpy((char *)gpios->gpios[count].name, "developer",
- GPIO_MAX_NAME_LENGTH);
- count++;
-
gpios->size = sizeof(*gpios) + (count * sizeof(struct lb_gpio));
gpios->count = count;
printk(BIOS_ERR, "Added %d GPIOS size %d\n", count, gpios->size);
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
uint32_t ec_events;
diff --git a/src/mainboard/google/eve/chromeos.c b/src/mainboard/google/eve/chromeos.c
index de83eaa637..a77a23e06a 100644
--- a/src/mainboard/google/eve/chromeos.c
+++ b/src/mainboard/google/eve/chromeos.c
@@ -29,7 +29,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/fizz/chromeos.c b/src/mainboard/google/fizz/chromeos.c
index 48001e89e3..bde805f42c 100644
--- a/src/mainboard/google/fizz/chromeos.c
+++ b/src/mainboard/google/fizz/chromeos.c
@@ -28,7 +28,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index 3f02e68c13..c408ca1f9d 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select VBOOT_VBNV_FLASH
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c
index e04aff17bf..3f86c29f22 100644
--- a/src/mainboard/google/foster/chromeos.c
+++ b/src/mainboard/google/foster/chromeos.c
@@ -52,14 +52,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
GPIO_MAX_NAME_LENGTH);
count++;
- /* Developer: virtual GPIO active high */
- gpios->gpios[count].port = -1;
- gpios->gpios[count].polarity = ACTIVE_HIGH;
- gpios->gpios[count].value = get_developer_mode_switch();
- strncpy((char *)gpios->gpios[count].name, "developer",
- GPIO_MAX_NAME_LENGTH);
- count++;
-
/* TODO: Reset: active low (output) */
gpios->gpios[count].port = GPIO(I5);
gpios->gpios[count].polarity = ACTIVE_LOW;
@@ -74,11 +66,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
printk(BIOS_ERR, "Added %d GPIOS size %d\n", count, gpios->size);
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
#if CONFIG_EC_GOOGLE_CHROMEEC
diff --git a/src/mainboard/google/gale/Kconfig b/src/mainboard/google/gale/Kconfig
index 01e2945baf..b6639bc5d5 100644
--- a/src/mainboard/google/gale/Kconfig
+++ b/src/mainboard/google/gale/Kconfig
@@ -33,7 +33,6 @@ config BOARD_SPECIFIC_OPTIONS
config CHROMEOS
select VBOOT_DISABLE_DEV_ON_RECOVERY
- select VIRTUAL_DEV_SWITCH
select WIPEOUT_SUPPORTED
config BOARD_VARIANT_DK01
diff --git a/src/mainboard/google/gale/chromeos.c b/src/mainboard/google/gale/chromeos.c
index 92a16b1cbe..939b061b6e 100644
--- a/src/mainboard/google/gale/chromeos.c
+++ b/src/mainboard/google/gale/chromeos.c
@@ -25,8 +25,6 @@
#include <timer.h>
#include <vendorcode/google/chromeos/chromeos.h>
-#define DEV_SW 41
-#define DEV_POL ACTIVE_LOW
#define REC_POL ACTIVE_LOW
#define WP_POL ACTIVE_LOW
@@ -71,7 +69,6 @@ static int read_gpio(gpio_t gpio_num)
void fill_lb_gpios(struct lb_gpios *gpios)
{
struct lb_gpio chromeos_gpios[] = {
- {DEV_SW, DEV_POL, read_gpio(DEV_SW), "developer"},
{get_rec_sw_gpio_pin(), REC_POL,
read_gpio(get_rec_sw_gpio_pin()), "recovery"},
{get_wp_status_gpio_pin(), WP_POL,
@@ -82,11 +79,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
/*
* The recovery switch on storm is overloaded: it needs to be pressed for a
* certain duration at startup to signal different requests:
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index 9ee6e6f564..3cb3d89978 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -31,7 +31,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index c9886f66ab..bd19a291dc 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -47,11 +47,9 @@ config BOARD_SPECIFIC_OPTIONS
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select MAINBOARD_HAS_SPI_TPM_CR50 if GRU_HAS_TPM2
select SPI_TPM if GRU_HAS_TPM2
select VBOOT_VBNV_FLASH
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 37dac7e40c..39cee21044 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -16,7 +16,6 @@ config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
select PHYSICAL_REC_SWITCH
select VBOOT_VBNV_CMOS
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index c22f942960..5f897f32fc 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -40,7 +40,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
get_gpio(GPIO_SPI_WP), "write protect"},
{GPIO_REC_MODE, ACTIVE_LOW,
get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, 1, "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
@@ -60,11 +59,6 @@ int get_write_protect_state(void)
return (pci_read_config32(dev, SATA_SP) >> FLAG_SPI_WP) & 1;
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
device_t dev;
diff --git a/src/mainboard/google/lars/chromeos.c b/src/mainboard/google/lars/chromeos.c
index 42763a7d34..54f9bbedcc 100644
--- a/src/mainboard/google/lars/chromeos.c
+++ b/src/mainboard/google/lars/chromeos.c
@@ -30,7 +30,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/link/chromeos.c b/src/mainboard/google/link/chromeos.c
index 0469d65c7c..335f1f7f79 100644
--- a/src/mainboard/google/link/chromeos.c
+++ b/src/mainboard/google/link/chromeos.c
@@ -54,12 +54,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
gpios->gpios[3].value = 0;
strncpy((char *)gpios->gpios[3].name,"power", GPIO_MAX_NAME_LENGTH);
- /* Developer: a tricky case on Link, there is no switch */
- gpios->gpios[4].port = -1; /* Indicate that this is a pseudo GPIO */
- gpios->gpios[4].polarity = ACTIVE_HIGH;
- gpios->gpios[4].value = get_developer_mode_switch();
- strncpy((char *)gpios->gpios[4].name,"developer", GPIO_MAX_NAME_LENGTH);
-
/* Did we load the VGA Option ROM? */
gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
gpios->gpios[5].polarity = ACTIVE_HIGH;
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 515d16bd78..7f5854ce03 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -33,9 +33,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select VBOOT_VBNV_EC
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index aa7c9c69f6..4fb8e78cab 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -25,7 +25,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
{GPIO(Q0), ACTIVE_LOW, -1, "power"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
{GPIO(I5), ACTIVE_LOW, -1, "reset"},
};
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index c8411bf435..602e778569 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -34,9 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select VBOOT_VBNV_EC
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index 2c9ba28e5f..f466d914ad 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -25,7 +25,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
{GPIO(Q0), ACTIVE_LOW, -1, "power"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
{GPIO(I5), ACTIVE_LOW, -1, "reset"},
};
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 530397c425..d64eb72c84 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -35,9 +35,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select VBOOT_VBNV_EC
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index 2c9ba28e5f..f466d914ad 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -25,7 +25,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
{GPIO(R4), ACTIVE_HIGH, -1, "lid"},
{GPIO(Q0), ACTIVE_LOW, -1, "power"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{GPIO(U4), ACTIVE_HIGH, -1, "EC in RW"},
{GPIO(I5), ACTIVE_LOW, -1, "reset"},
};
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index 083ed9ced5..0efa478dc4 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -35,11 +35,9 @@ config BOARD_SPECIFIC_OPTIONS
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select VBOOT_EC_SLOW_UPDATE
select VBOOT_OPROM_MATTERS
select VBOOT_VBNV_FLASH
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/oak/chromeos.c b/src/mainboard/google/oak/chromeos.c
index fe4574e89c..a581364d1d 100644
--- a/src/mainboard/google/oak/chromeos.c
+++ b/src/mainboard/google/oak/chromeos.c
@@ -40,7 +40,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
{LID, ACTIVE_HIGH, -1, "lid"},
{POWER_BUTTON, ACTIVE_HIGH, -1, "power"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{EC_IN_RW, ACTIVE_HIGH, -1, "EC in RW"},
{EC_IRQ, ACTIVE_LOW, -1, "EC interrupt"},
};
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index 4dcbfa5f40..d2448eb253 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -56,12 +56,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
gpios->gpios[1].value = get_recovery_mode_switch();
strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
- /* Developer: Virtual GPIO in the EC ( Servo GPIO17 active low) */
- gpios->gpios[2].port = -1;
- gpios->gpios[2].polarity = ACTIVE_HIGH;
- gpios->gpios[2].value = get_developer_mode_switch();
- strncpy((char *)gpios->gpios[2].name,"developer", GPIO_MAX_NAME_LENGTH);
-
/* Lid switch GPIO active high (open). */
gpios->gpios[3].port = 15;
gpios->gpios[3].polarity = ACTIVE_HIGH;
@@ -88,22 +82,6 @@ int get_lid_switch(void)
return get_gpio(15);
}
-int get_developer_mode_switch(void)
-{
- u8 gpio = !get_gpio(17);
- /*
- * Dev mode is controlled by EC and uboot stores a flag in TPM.
- * This GPIO is only for the debug header.
- * It is AND'd to the EC request.
- */
-
- printk(BIOS_DEBUG, "DEV MODE GPIO 17: %x\n", gpio);
-
- /* GPIO17, active low -- return active high reading and let
- * it be inverted by the caller if needed. */
- return gpio;
-}
-
int get_write_protect_state(void)
{
return !get_gpio(70);
diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c
index bc3a279dd1..4cab7dcb86 100644
--- a/src/mainboard/google/peach_pit/chromeos.c
+++ b/src/mainboard/google/peach_pit/chromeos.c
@@ -59,25 +59,12 @@ void fill_lb_gpios(struct lb_gpios *gpios)
GPIO_MAX_NAME_LENGTH);
count++;
- /* Developer: virtual GPIO active high */
- gpios->gpios[count].port = -1;
- gpios->gpios[count].polarity = ACTIVE_HIGH;
- gpios->gpios[count].value = get_developer_mode_switch();
- strncpy((char *)gpios->gpios[count].name, "developer",
- GPIO_MAX_NAME_LENGTH);
- count++;
-
gpios->size = sizeof(*gpios) + (count * sizeof(struct lb_gpio));
gpios->count = count;
printk(BIOS_ERR, "Added %d GPIOS size %d\n", count, gpios->size);
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
uint32_t ec_events;
diff --git a/src/mainboard/google/poppy/chromeos.c b/src/mainboard/google/poppy/chromeos.c
index 03a9afea0b..8004d7bd8d 100644
--- a/src/mainboard/google/poppy/chromeos.c
+++ b/src/mainboard/google/poppy/chromeos.c
@@ -28,7 +28,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/purin/chromeos.c b/src/mainboard/google/purin/chromeos.c
index e6843a1489..5e7cdfe5c1 100644
--- a/src/mainboard/google/purin/chromeos.c
+++ b/src/mainboard/google/purin/chromeos.c
@@ -20,11 +20,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
return 0;
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 128e609577..9b25b49b45 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -15,10 +15,8 @@ if BOARD_GOOGLE_BASEBOARD_RAMBI
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select LID_SWITCH
select VBOOT_VBNV_CMOS
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c
index 10e076209d..99a97d8bf4 100644
--- a/src/mainboard/google/rambi/chromeos.c
+++ b/src/mainboard/google/rambi/chromeos.c
@@ -29,7 +29,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/reef/chromeos.c b/src/mainboard/google/reef/chromeos.c
index 256db16548..7b7f2b8ce0 100644
--- a/src/mainboard/google/reef/chromeos.c
+++ b/src/mainboard/google/reef/chromeos.c
@@ -25,7 +25,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/rotor/chromeos.c b/src/mainboard/google/rotor/chromeos.c
index e03114f4e2..c73fe47d15 100644
--- a/src/mainboard/google/rotor/chromeos.c
+++ b/src/mainboard/google/rotor/chromeos.c
@@ -23,11 +23,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
/*TODO: implement fill_lb_gpios */
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
return 0;
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 0413cd846a..a19c966e6e 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -23,11 +23,9 @@ if BOARD_GOOGLE_BASEBOARD_SLIPPY
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select LID_SWITCH
select MAINBOARD_DO_NATIVE_VGA_INIT if (BOARD_GOOGLE_FALCO || BOARD_GOOGLE_PEPPY)
select VBOOT_VBNV_CMOS
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index 22ec0742e2..e26c3fb005 100644
--- a/src/mainboard/google/slippy/chromeos.c
+++ b/src/mainboard/google/slippy/chromeos.c
@@ -27,7 +27,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{58, ACTIVE_HIGH, 0, "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index ba6252b830..52076748a5 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -34,9 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select VBOOT_VBNV_FLASH
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index 0372584ae0..fe8e5aa95d 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -26,7 +26,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
gpio_get(WRITE_PROTECT_L), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
{POWER_BUTTON, ACTIVE_LOW, -1, "power"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{EC_IN_RW, ACTIVE_HIGH, -1, "EC in RW"},
{AP_SYS_RESET_L, ACTIVE_LOW, -1, "reset"},
};
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index 268b11d82f..f844cf8b04 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS
config CHROMEOS
select VBOOT_DISABLE_DEV_ON_RECOVERY
select WIPEOUT_SUPPORTED
- select VIRTUAL_DEV_SWITCH
config BOARD_VARIANT_AP148
bool "pick this to build an image for ap148"
diff --git a/src/mainboard/google/storm/chromeos.c b/src/mainboard/google/storm/chromeos.c
index a379280ca5..3110228ef2 100644
--- a/src/mainboard/google/storm/chromeos.c
+++ b/src/mainboard/google/storm/chromeos.c
@@ -43,7 +43,6 @@ static int read_gpio(gpio_t gpio_num)
void fill_lb_gpios(struct lb_gpios *gpios)
{
struct lb_gpio chromeos_gpios[] = {
- {DEV_SW, ACTIVE_LOW, read_gpio(DEV_SW), "developer"},
{REC_SW, ACTIVE_LOW, read_gpio(REC_SW), "recovery"},
{WP_SW, ACTIVE_LOW, read_gpio(WP_SW), "write protect"},
{-1, ACTIVE_LOW, 1, "power"},
@@ -52,11 +51,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
/*
* The recovery switch on storm is overloaded: it needs to be pressed for a
* certain duration at startup to signal different requests:
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c
index cbb9574a91..047e6a1fcb 100644
--- a/src/mainboard/google/stout/chromeos.c
+++ b/src/mainboard/google/stout/chromeos.c
@@ -49,12 +49,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
gpios->gpios[1].value = get_recovery_mode_switch();
strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
- /* Developer: Virtual switch */
- gpios->gpios[2].port = -1;
- gpios->gpios[2].polarity = ACTIVE_HIGH;
- gpios->gpios[2].value = get_developer_mode_switch();
- strncpy((char *)gpios->gpios[2].name,"developer", GPIO_MAX_NAME_LENGTH);
-
/* Lid Switch: Virtual switch */
gpios->gpios[3].port = -1;
gpios->gpios[3].polarity = ACTIVE_HIGH;
@@ -92,12 +86,6 @@ int get_lid_switch(void)
return 1;
}
-/* The dev-switch is virtual on Stout (and so handled elsewhere). */
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
/*
* The recovery-switch is virtual on Stout and is handled via the EC.
* Stout recovery mode is only valid if RTC_PWR_STS is set and the EC
diff --git a/src/mainboard/google/urara/chromeos.c b/src/mainboard/google/urara/chromeos.c
index 4db06c6a5c..3f7ec32864 100644
--- a/src/mainboard/google/urara/chromeos.c
+++ b/src/mainboard/google/urara/chromeos.c
@@ -29,12 +29,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
printk(BIOS_ERR, "%s unsupported, but called\n", __func__);
}
-int get_developer_mode_switch(void)
-{
- printk(BIOS_ERR, "%s unsupported, but called\n", __func__);
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
printk(BIOS_ERR, "%s unsupported, but called\n", __func__);
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index e6386529ac..3eb32525a1 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -46,9 +46,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_WINBOND
config CHROMEOS
- select EC_SOFTWARE_SYNC
select VBOOT_VBNV_EC
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron/chromeos.c
index b73062295a..b8fb3bcd4b 100644
--- a/src/mainboard/google/veyron/chromeos.c
+++ b/src/mainboard/google/veyron/chromeos.c
@@ -47,7 +47,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
get_recovery_mode_switch(), "recovery"},
{GPIO_LID.raw, ACTIVE_HIGH, -1, "lid"},
{GPIO_POWER.raw, ACTIVE_LOW, -1, "power"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{GPIO_ECINRW.raw, ACTIVE_HIGH, -1, "EC in RW"},
{GPIO_ECIRQ.raw, ACTIVE_LOW, -1, "EC interrupt"},
{GPIO_RESET.raw, ACTIVE_HIGH, -1, "reset"},
@@ -56,11 +55,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
uint32_t ec_events;
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index 1a948316a7..24d7921bc9 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -33,7 +33,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select PHYSICAL_REC_SWITCH
select VBOOT_VBNV_FLASH
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron_mickey/chromeos.c b/src/mainboard/google/veyron_mickey/chromeos.c
index 5cb9ec4c30..2988ea7b9c 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.c
+++ b/src/mainboard/google/veyron_mickey/chromeos.c
@@ -36,17 +36,11 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{GPIO_WP.raw, ACTIVE_LOW, gpio_get(GPIO_WP), "write protect"},
{GPIO_RECOVERY.raw, ACTIVE_LOW,
gpio_get(GPIO_RECOVERY), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{GPIO_RESET.raw, ACTIVE_HIGH, -1, "reset"},
};
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
return !gpio_get(GPIO_RECOVERY);
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index b6d3f6563d..bbd6ffddfb 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -33,7 +33,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config CHROMEOS
select PHYSICAL_REC_SWITCH
select VBOOT_VBNV_FLASH
- select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron_rialto/chromeos.c b/src/mainboard/google/veyron_rialto/chromeos.c
index ac1afd9911..c68cd7ae8c 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.c
+++ b/src/mainboard/google/veyron_rialto/chromeos.c
@@ -44,17 +44,11 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{GPIO_RECOVERY_PUSHKEY.raw, ACTIVE_LOW,
!get_recovery_mode_switch(), "recovery"},
{GPIO_POWER.raw, ACTIVE_LOW, -1, "power"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{GPIO_RESET.raw, ACTIVE_HIGH, -1, "reset"},
};
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
// Both RECOVERY_SERVO and RECOVERY_PUSHKEY are low active.
diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c
index 1666fc5528..5ed9e3681c 100644
--- a/src/mainboard/intel/baskingridge/chromeos.c
+++ b/src/mainboard/intel/baskingridge/chromeos.c
@@ -36,7 +36,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
return;
u32 gp_lvl = inl(gpio_base + GP_LVL);
- u32 gp_lvl2 = inl(gpio_base + GP_LVL2);
u32 gp_lvl3 = inl(gpio_base + GP_LVL3);
gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio));
@@ -55,12 +54,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
gpios->gpios[1].value = (gp_lvl3 >> (69-64)) & 1;
strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
- /* Developer: GPIO48 - BIOS_RESP - J8E4 (silkscreen: J8E3) */
- gpios->gpios[2].port = 48;
- gpios->gpios[2].polarity = ACTIVE_LOW;
- gpios->gpios[2].value = (gp_lvl2 >> (48-32)) & 1;
- strncpy((char *)gpios->gpios[2].name,"developer", GPIO_MAX_NAME_LENGTH);
-
/* Hard code the lid switch GPIO to open. */
gpios->gpios[3].port = -1;
gpios->gpios[3].polarity = ACTIVE_HIGH;
@@ -81,15 +74,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
}
#endif
-int get_developer_mode_switch(void)
-{
- /*
- * Developer: GPIO48, Connected to J8E4, however the silkscreen says
- * J8E3. The jumper is active low.
- */
- return !get_gpio(48);
-}
-
int get_recovery_mode_switch(void)
{
/*
diff --git a/src/mainboard/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c
index 896f8767f8..eac995a839 100644
--- a/src/mainboard/intel/emeraldlake2/chromeos.c
+++ b/src/mainboard/intel/emeraldlake2/chromeos.c
@@ -55,12 +55,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
gpios->gpios[1].value = (gp_lvl >> 22) & 1;
strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
- /* Developer: GPIO57 */
- gpios->gpios[2].port = 57;
- gpios->gpios[2].polarity = ACTIVE_LOW;
- gpios->gpios[2].value = (gp_lvl2 >> (57-32)) & 1;
- strncpy((char *)gpios->gpios[2].name,"developer", GPIO_MAX_NAME_LENGTH);
-
/* Hard code the lid switch GPIO to open. */
gpios->gpios[3].port = -1;
gpios->gpios[3].polarity = ACTIVE_HIGH;
@@ -81,12 +75,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
}
#endif
-int get_developer_mode_switch(void)
-{
- /* Developer: GPIO57, active high */
- return get_gpio(57);
-}
-
int get_recovery_mode_switch(void)
{
/* Recovery: GPIO22, active low */
diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c
index cc8831eaeb..70fe11338c 100644
--- a/src/mainboard/intel/galileo/vboot.c
+++ b/src/mainboard/intel/galileo/vboot.c
@@ -32,11 +32,6 @@ int clear_recovery_mode_switch(void)
return 0;
}
-int get_developer_mode_switch(void)
-{
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
return 0;
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index fc1bcd2b9d..4bd802a65a 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -36,7 +36,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
@@ -55,12 +54,6 @@ int get_lid_switch(void)
return 1;
}
-int get_developer_mode_switch(void)
-{
- /* No physical developer mode switch. */
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) {
diff --git a/src/mainboard/intel/kunimitsu/chromeos.c b/src/mainboard/intel/kunimitsu/chromeos.c
index 42763a7d34..54f9bbedcc 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.c
+++ b/src/mainboard/intel/kunimitsu/chromeos.c
@@ -30,7 +30,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 8915323a06..c7221e915d 100644
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -17,10 +17,8 @@ config BOARD_SPECIFIC_OPTIONS
config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES
- select EC_SOFTWARE_SYNC
select LID_SWITCH
select VBOOT_VBNV_CMOS
- select VIRTUAL_DEV_SWITCH
config DYNAMIC_VNN_SUPPORT
bool "Enables support for Dynamic VNN"
diff --git a/src/mainboard/intel/strago/chromeos.c b/src/mainboard/intel/strago/chromeos.c
index 6d00d72dee..fbcbcf7757 100644
--- a/src/mainboard/intel/strago/chromeos.c
+++ b/src/mainboard/intel/strago/chromeos.c
@@ -32,7 +32,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
{-1, ACTIVE_HIGH, vboot_recovery_mode_enabled(), "recovery"},
- {-1, ACTIVE_HIGH, get_developer_mode_switch(), "developer"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index 862f4a411c..fe98fd85ec 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -21,8 +21,7 @@
#include <soc/gpio.h>
#include <vendorcode/google/chromeos/chromeos.h>
-/* Compile-time settings for developer and recovery mode. */
-#define DEV_MODE_SETTING 1
+/* Compile-time settings for recovery mode. */
#define REC_MODE_SETTING 0
#ifndef __PRE_RAM__
@@ -33,7 +32,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
struct lb_gpio chromeos_gpios[] = {
{-1, ACTIVE_HIGH, 0, "write protect"},
{-1, ACTIVE_HIGH, REC_MODE_SETTING, "recovery"},
- {-1, ACTIVE_HIGH, DEV_MODE_SETTING, "developer"},
{-1, ACTIVE_HIGH, 1, "lid"}, // force open
{-1, ACTIVE_HIGH, 0, "power"},
{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
@@ -42,11 +40,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
}
#endif
-int get_developer_mode_switch(void)
-{
- return DEV_MODE_SETTING;
-}
-
int get_recovery_mode_switch(void)
{
return REC_MODE_SETTING;
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 7cb00e5fb8..db1debb0ee 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -21,6 +21,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
config CHROMEOS
+ select PHYSICAL_DEV_SWITCH
+ select PHYSICAL_REC_SWITCH
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 3777f69982..f8e9b99b01 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
config CHROMEOS
+ select PHYSICAL_DEV_SWITCH
select PHYSICAL_REC_SWITCH
select VBOOT_VBNV_CMOS
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 9b847da1d9..234e2900b9 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -70,14 +70,12 @@ config CPU_SPECIFIC_OPTIONS
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
- select EC_SOFTWARE_SYNC if EC_GOOGLE_CHROMEEC
select SEPARATE_VERSTAGE
select VBOOT_OPROM_MATTERS
select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
select VBOOT_STARTS_IN_BOOTBLOCK
select VBOOT_VBNV_CMOS
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
- select VIRTUAL_DEV_SWITCH
config TPM_ON_FAST_SPI
bool
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 01083723f8..b7c5552a7a 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -87,7 +87,6 @@ config USE_FSP1_1_DRIVER
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
- select EC_SOFTWARE_SYNC if EC_GOOGLE_CHROMEEC
select SEPARATE_VERSTAGE
select VBOOT_EC_SLOW_UPDATE if EC_GOOGLE_CHROMEEC
select VBOOT_OPROM_MATTERS
@@ -95,7 +94,6 @@ config CHROMEOS
select VBOOT_STARTS_IN_BOOTBLOCK
select VBOOT_VBNV_CMOS
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
- select VIRTUAL_DEV_SWITCH
config BOOTBLOCK_RESETS
string
diff --git a/src/vboot/bootmode.c b/src/vboot/bootmode.c
index 46b78e1dad..21922d4ce7 100644
--- a/src/vboot/bootmode.c
+++ b/src/vboot/bootmode.c
@@ -162,9 +162,6 @@ int vboot_developer_mode_enabled(void)
if (!IS_ENABLED(CONFIG_VBOOT))
return 0;
- if (get_developer_mode_switch())
- return 1;
-
if (cbmem_possibly_online() && vboot_handoff_check_developer_flag())
return 1;
diff --git a/src/vboot/vboot_handoff.c b/src/vboot/vboot_handoff.c
index 2bd5c093f0..85be928ae3 100644
--- a/src/vboot/vboot_handoff.c
+++ b/src/vboot/vboot_handoff.c
@@ -83,7 +83,7 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff,
vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON;
}
/* TODO: Set these in depthcharge */
- if (IS_ENABLED(CONFIG_VIRTUAL_DEV_SWITCH))
+ if (!IS_ENABLED(CONFIG_PHYSICAL_DEV_SWITCH))
vb_sd->flags |= VBSD_HONOR_VIRT_DEV_SWITCH;
if (IS_ENABLED(CONFIG_EC_SOFTWARE_SYNC))
vb_sd->flags |= VBSD_EC_SOFTWARE_SYNC;
diff --git a/src/vboot/vboot_logic.c b/src/vboot/vboot_logic.c
index af7e947911..fbbe3e8be7 100644
--- a/src/vboot/vboot_logic.c
+++ b/src/vboot/vboot_logic.c
@@ -329,7 +329,7 @@ void verstage_main(void)
antirollback_read_space_firmware(&ctx);
timestamp_add_now(TS_END_TPMINIT);
- if (!IS_ENABLED(CONFIG_VIRTUAL_DEV_SWITCH) &&
+ if (IS_ENABLED(CONFIG_PHYSICAL_DEV_SWITCH) &&
get_developer_mode_switch())
ctx.flags |= VB2_CONTEXT_FORCE_DEVELOPER_MODE;
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index 3c6237abcf..62e60d40d4 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -61,6 +61,7 @@ config CHROMEOS_RAMOOPS_RAM_SIZE
config EC_SOFTWARE_SYNC
bool "Enable EC software sync"
+ default y if EC_GOOGLE_CHROMEEC
default n
depends on VBOOT
help
@@ -76,13 +77,6 @@ config VBOOT_EC_SLOW_UPDATE
Whether the EC (or PD) is slow to update and needs to display a
screen that informs the user the update is happening.
-config VIRTUAL_DEV_SWITCH
- bool "Virtual developer switch support"
- default n
- depends on VBOOT
- help
- Whether this platform has a virtual developer switch.
-
config NO_TPM_RESUME
bool
default n
@@ -91,8 +85,17 @@ config NO_TPM_RESUME
boards, booting Windows will break if the TPM resume command
is sent during an S3 resume.
+config PHYSICAL_DEV_SWITCH
+ bool
+ default n
+ help
+ Whether this platform has a physical developer switch. Note that this
+ disables virtual dev switch functionality (through secdata). Operation
+ where both a physical pin and the virtual switch get sampled is not
+ supported by coreboot.
+
config PHYSICAL_REC_SWITCH
- bool "Physical recovery switch is present"
+ bool
default n
help
Whether this platform has a physical recovery switch
diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c
index dddce63f0f..4edf74a844 100644
--- a/src/vendorcode/google/chromeos/chromeos.c
+++ b/src/vendorcode/google/chromeos/chromeos.c
@@ -17,12 +17,6 @@
#include <string.h>
#include "chromeos.h"
-int __attribute__((weak)) get_developer_mode_switch(void)
-{
- // Weak implementation. No physical developer switch.
- return 0;
-}
-
int __attribute__((weak)) clear_recovery_mode_switch(void)
{
// Weak implementation. Nothing to do.