From 5687fc9d2120c01b929f24df07667f87089f9b5f Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Thu, 28 Nov 2013 18:11:49 +0200
Subject: Declare recovery and developer modes outside ChromeOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the implementation for recovery and developer modes from
vendorcode/google/chromes to lib/.

Change-Id: I33335fb282de2c7bc613dc58d6912c47f3b5c06c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4308
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
---
 src/northbridge/intel/haswell/raminit.c     | 7 +------
 src/northbridge/intel/sandybridge/raminit.c | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/northbridge')

diff --git a/src/northbridge/intel/haswell/raminit.c b/src/northbridge/intel/haswell/raminit.c
index 1e020f95b5..4138c5f572 100644
--- a/src/northbridge/intel/haswell/raminit.c
+++ b/src/northbridge/intel/haswell/raminit.c
@@ -18,6 +18,7 @@
  */
 
 #include <console/console.h>
+#include <bootmode.h>
 #include <string.h>
 #include <arch/hlt.h>
 #include <arch/io.h>
@@ -31,12 +32,6 @@
 #include "pei_data.h"
 #include "haswell.h"
 
-#if CONFIG_CHROMEOS
-#include <vendorcode/google/chromeos/chromeos.h>
-#else
-#define recovery_mode_enabled(x) 0
-#endif
-
 void save_mrc_data(struct pei_data *pei_data)
 {
 	struct mrc_data_container *mrcdata;
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index 61e15450f0..5384996e6d 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -19,6 +19,7 @@
 
 #include <console/console.h>
 #include <console/usb.h>
+#include <bootmode.h>
 #include <string.h>
 #include <arch/hlt.h>
 #include <arch/io.h>
@@ -34,11 +35,6 @@
 
 /* Management Engine is in the southbridge */
 #include "southbridge/intel/bd82x6x/me.h"
-#if CONFIG_CHROMEOS
-#include <vendorcode/google/chromeos/chromeos.h>
-#else
-#define recovery_mode_enabled(x) 0
-#endif
 
 /*
  * MRC scrambler seed offsets should be reserved in
-- 
cgit v1.2.3