Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50252 )
Change subject: soc/intel/broadwell: Convert some CONFIG(CHROMEOS) preprocessor ......................................................................
soc/intel/broadwell: Convert some CONFIG(CHROMEOS) preprocessor
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 --- M src/soc/intel/broadwell/gma.c 1 file changed, 1 insertion(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Matt DeVillier: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c index 45d1833..b6ce426 100644 --- a/src/soc/intel/broadwell/gma.c +++ b/src/soc/intel/broadwell/gma.c @@ -515,12 +515,8 @@
/* 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 */