summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-09-12 06:23:51 -0700
committerIsaac Christensen <isaac.christensen@se-eng.com>2014-08-14 20:02:19 +0200
commitd29bf2068f27d632fd02db75634b746c594681f8 (patch)
tree607eef1449dac9fc2b2f37ee1a88592e5b771494
parent1ab202795532cdce155e42738d84e77a3e77ceb2 (diff)
downloadcoreboot-d29bf2068f27d632fd02db75634b746c594681f8.tar.xz
pit: snow: Fix snow, fix up pit write protect.
A recent change to support early firmware selection on ARM broke snow and was incompletely implemented on pit. This change fixes snow by applying the remaining part of the change that had been applied to pit, and also hooks up real values in the get_write_protect_state function. Change-Id: Ifef7ad1bf399f79353daec3dd46973f2b2022e37 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://chromium-review.googlesource.com/169120 Reviewed-by: David Hendrix <dhendrix@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> Tested-by: Gabe Black <gabeblack@chromium.org> (cherry picked from commit 841773e048cd9cfbb64782059c24e29c467f17c8) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6635 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/mainboard/google/pit/chromeos.c2
-rw-r--r--src/mainboard/google/snow/chromeos.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mainboard/google/pit/chromeos.c b/src/mainboard/google/pit/chromeos.c
index c2db165834..2933a352bd 100644
--- a/src/mainboard/google/pit/chromeos.c
+++ b/src/mainboard/google/pit/chromeos.c
@@ -97,5 +97,5 @@ int get_recovery_mode_switch(void)
int get_write_protect_state(void)
{
- return 0; // FIXME what GPIO? // WP hard coded to disabled
+ return !gpio_get_value(GPIO_X30);
}
diff --git a/src/mainboard/google/snow/chromeos.c b/src/mainboard/google/snow/chromeos.c
index de882ab8c3..5310a4dbef 100644
--- a/src/mainboard/google/snow/chromeos.c
+++ b/src/mainboard/google/snow/chromeos.c
@@ -95,7 +95,7 @@ int get_recovery_mode_switch(void)
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
}
-int get_recovery_mode_from_vbnv(void)
+int get_write_protect_state(void)
{
- return 0;
+ return !gpio_get_value(GPIO_D16);
}