diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2014-11-10 13:00:27 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-04-10 20:13:05 +0200 |
| commit | b8a7b71e611fed87a41cc940baa1e42624f97657 (patch) | |
| tree | 1e007c4b0264926b1580da8d15b72fc8d9dcc606 /src/soc | |
| parent | e0dae99b47faf6e750938bc52550128a4351f93e (diff) | |
broadwell: Only do pre-graphics delay when running option rom
This changes the broadwell graphics init path to only do the delay
before initializing graphics when running chromeos if we are also
going to execute the option rom.
BUG=chrome-os-partner:33671
BRANCH=samus
TEST=build and boot on samus
Change-Id: Idb7d39b22f7f6dc3be6dfbd2fa3cc2e33d78a397
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Original-Commit-Id: f7ed93504a74760f16acb8fb3c6c57ac514b7260
Original-Change-Id: I350f85738efe3d17152de4f025adbfd52ae15b95
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/228882
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9474
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/broadwell/igd.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c index d8b51a3552..38189ddeeb 100644 --- a/src/soc/intel/broadwell/igd.c +++ b/src/soc/intel/broadwell/igd.c @@ -33,6 +33,7 @@ #include <soc/ramstage.h> #include <soc/systemagent.h> #include <soc/intel/broadwell/chip.h> +#include <vendorcode/google/chromeos/chromeos.h> #define GT_RETRY 1000 #define GT_CDCLK_337 0 @@ -487,7 +488,13 @@ static void igd_init(struct device *dev) return; /* Wait for any configured pre-graphics delay */ +#if IS_ENABLED(CONFIG_CHROMEOS) + if (developer_mode_enabled() || recovery_mode_enabled() || + vboot_wants_oprom()) + mdelay(CONFIG_PRE_GRAPHICS_DELAY); +#else mdelay(CONFIG_PRE_GRAPHICS_DELAY); +#endif /* Early init steps */ if (is_broadwell) { |