GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

google/veyron_rialto: Remove developer mode switch 

The developer mode gpio switch on rialto is always hardcoded (through a
resistor) as developer mode. We need to ignore it to allow transitions to
verified mode with the virtual developer mode stuff.

TEST=We can now exit dev mode on rialto

Change-Id: I94a949f0973132de5fd008224af79cf612151193
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e78bb8f81eaa9c082e47ad818b64843c2565d00b
Original-Change-Id: If11d752d58a5f26fc270ef01b529dad18b4cce46
Original-Signed-off-by: Alexandru M Stan <amstan@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/325861
Original-Commit-Ready: Alexandru Stan <amstan@chromium.org>
Original-Tested-by: Alexandru Stan <amstan@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/13626
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Alexandru M Stan 2016-02-03 17:28:38 -08:00 committed by Patrick Georgi
parent d87cc3f24e
commit 70cada2de0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/google/veyron_rialto/chromeos.c
View File

@ -25,7 +25,6 @@
#define GPIO_POWER GPIO(0, A, 5) #define GPIO_POWER GPIO(0, A, 5)
#define GPIO_RECOVERY_SERVO GPIO(0, B, 1) #define GPIO_RECOVERY_SERVO GPIO(0, B, 1)
#define GPIO_RECOVERY_PUSHKEY GPIO(7, B, 1) #define GPIO_RECOVERY_PUSHKEY GPIO(7, B, 1)
#define GPIO_DEVELOPER_SWITCH GPIO(7, B, 2)
void setup_chromeos_gpios(void) void setup_chromeos_gpios(void)
@ -34,7 +33,6 @@ void setup_chromeos_gpios(void)
gpio_input(GPIO_POWER); gpio_input(GPIO_POWER);
gpio_input_pullup(GPIO_RECOVERY_SERVO); gpio_input_pullup(GPIO_RECOVERY_SERVO);
gpio_input_pullup(GPIO_RECOVERY_PUSHKEY); gpio_input_pullup(GPIO_RECOVERY_PUSHKEY);
gpio_input(GPIO_DEVELOPER_SWITCH); // board has pull up/down resistor.
} }
void fill_lb_gpios(struct lb_gpios *gpios) void fill_lb_gpios(struct lb_gpios *gpios)
@ -69,7 +67,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
count++; count++;
/* Developer: GPIO active high */ /* Developer: GPIO active high */
gpios->gpios[count].port = GPIO_DEVELOPER_SWITCH.raw; gpios->gpios[count].port = -1;
gpios->gpios[count].polarity = ACTIVE_HIGH; gpios->gpios[count].polarity = ACTIVE_HIGH;
gpios->gpios[count].value = get_developer_mode_switch(); gpios->gpios[count].value = get_developer_mode_switch();
strncpy((char *)gpios->gpios[count].name, "developer", strncpy((char *)gpios->gpios[count].name, "developer",
@ -92,8 +90,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_developer_mode_switch(void) int get_developer_mode_switch(void)
{ {
// GPIO_DEVELOPER_SWITCH is active high. return 0;
return gpio_get(GPIO_DEVELOPER_SWITCH);
} }
int get_recovery_mode_switch(void) int get_recovery_mode_switch(void)