[coreboot-gerrit] New patch to review for coreboot: bddc42a Put in correct dependency on CONFIG_CHROMEOS
Furquan Shaikh (furquan@google.com)
gerrit at coreboot.org
Wed Apr 23 22:47:52 CEST 2014
Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5578
-gerrit
commit bddc42aa48fde14d8fd2d131e4c0a72e9e7febe4
Author: Furquan Shaikh <furquan at google.com>
Date: Wed Apr 23 13:39:09 2014 -0700
Put in correct dependency on CONFIG_CHROMEOS
Correct the dependency on CONFIG_CHROMEOS and add macros where required to allow
compilation when the config option is not set
Change-Id: Ie7c7e041f306b3deea0c2d1b4e11512c36bdad2c
Signed-off-by: Furquan Shaikh <furquan at google.com>
---
src/ec/google/chromeec/ec.c | 10 ++++++++--
src/mainboard/google/link/i915.c | 2 ++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index f1cefae..a02b1b6 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -114,7 +114,10 @@ void google_chromeec_early_init(void)
google_chromeec_command(&cec_cmd);
if (cec_cmd.cmd_code ||
- (recovery_mode_enabled() &&
+ (
+#if CONFIG_CHROMEOS
+ recovery_mode_enabled() &&
+#endif
(cec_resp.current_image != EC_IMAGE_RO))) {
struct ec_params_reboot_ec reboot_ec;
/* Reboot the EC and make it come back in RO mode */
@@ -395,7 +398,10 @@ void google_chromeec_init(void)
}
if (cec_cmd.cmd_code ||
- (recovery_mode_enabled() &&
+ (
+#if CONFIG_CHROMEOS
+ recovery_mode_enabled() &&
+#endif
(cec_resp.current_image != EC_IMAGE_RO))) {
struct ec_params_reboot_ec reboot_ec;
/* Reboot the EC and make it come back in RO mode */
diff --git a/src/mainboard/google/link/i915.c b/src/mainboard/google/link/i915.c
index a38760b..fef8a73 100644
--- a/src/mainboard/google/link/i915.c
+++ b/src/mainboard/google/link/i915.c
@@ -379,6 +379,8 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
printk(BIOS_SPEW, "%ld microseconds\n", globalmicroseconds());
set_vbe_mode_info_valid(&edid, graphics);
i915_init_done = 1;
+#if CONFIG_CHROMEOS
oprom_is_loaded = 1;
+#endif
return 0;
}
More information about the coreboot-gerrit
mailing list