From 2dba2949fa32d71e38042b349eaafa0780e807bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 18 Aug 2019 18:30:40 +0300 Subject: google/rambi: Replace __PRE_RAM__ with ENV_ROMSTAGE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9d86f8475221b52ccdb45cdeaf538e85ab7a17c0 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34981 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/rambi/chromeos.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c index 859fb0bc6f..3472b1c4b4 100644 --- a/src/mainboard/google/rambi/chromeos.c +++ b/src/mainboard/google/rambi/chromeos.c @@ -41,9 +41,8 @@ int get_write_protect_state(void) * there is a 10K pullup. Disable the internal pull in romstage so that * there isn't any ambiguity in the reading. */ -#if defined(__PRE_RAM__) - ssus_disable_internal_pull(WP_STATUS_PAD); -#endif + if (ENV_ROMSTAGE) + ssus_disable_internal_pull(WP_STATUS_PAD); /* WP is enabled when the pin is reading high. */ return ssus_get_gpio(WP_STATUS_PAD); -- cgit v1.2.3