From 74bc46c4db959133e579da129638fb51a41d7ccd Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Sat, 19 Dec 2020 23:43:56 +0200
Subject: soc/intel/broadwell: Convert some CONFIG(CHROMEOS) preprocessor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie3feee0448175db2b6ed4e8e37d92de3af9be371
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50252
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/soc/intel/broadwell/gma.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/soc/intel/broadwell')

diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c
index 45d18331af..b6ce426cde 100644
--- a/src/soc/intel/broadwell/gma.c
+++ b/src/soc/intel/broadwell/gma.c
@@ -515,12 +515,8 @@ static void igd_init(struct device *dev)
 
 	/* Wait for any configured pre-graphics delay */
 	if (!acpi_is_wakeup_s3()) {
-#if CONFIG(CHROMEOS)
-		if (display_init_required())
+		if (!CONFIG(CHROMEOS) || display_init_required())
 			mdelay(CONFIG_PRE_GRAPHICS_DELAY);
-#else
-		mdelay(CONFIG_PRE_GRAPHICS_DELAY);
-#endif
 	}
 
 	/* Early init steps */
-- 
cgit v1.2.3