From 351e3e520ba71b4aafaf930af37f78b71c1d7251 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Fri, 5 Apr 2019 18:11:19 +0200
Subject: src: Use include <console/console.h> when appropriate

Change-Id: Iddba5b03fc554a6edc4b26458d834e47958a6b08
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32214
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: David Guckian
---
 src/mainboard/intel/baskingridge/mainboard_smi.c      | 1 -
 src/mainboard/intel/cannonlake_rvp/spd/spd_util.c     | 3 ++-
 src/mainboard/intel/icelake_rvp/romstage_fsp_params.c | 4 ++--
 src/mainboard/intel/icelake_rvp/spd/spd_util.c        | 3 ++-
 src/mainboard/intel/kblrvp/spd/spd_util.c             | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/mainboard/intel')

diff --git a/src/mainboard/intel/baskingridge/mainboard_smi.c b/src/mainboard/intel/baskingridge/mainboard_smi.c
index 0fd0639b56..da6f8e8199 100644
--- a/src/mainboard/intel/baskingridge/mainboard_smi.c
+++ b/src/mainboard/intel/baskingridge/mainboard_smi.c
@@ -15,7 +15,6 @@
 
 #include <arch/acpi.h>
 #include <arch/io.h>
-#include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
 #include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c b/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c
index 5ceff51f44..dd209dce55 100644
--- a/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c
+++ b/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c
@@ -12,10 +12,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/byteorder.h>
-#include <console/console.h>
 #include <stdint.h>
 #include <string.h>
+
 #include "spd.h"
 
 void mainboard_fill_dq_map_ch0(void *dq_map_ptr)
diff --git a/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c b/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
index dd33021ae5..b9ce3941f4 100644
--- a/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
+++ b/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
@@ -14,12 +14,12 @@
  */
 
 #include <arch/byteorder.h>
-#include <console/console.h>
 #include <fsp/api.h>
 #include <soc/romstage.h>
-#include "spd/spd.h"
 #include <spd_bin.h>
 
+#include "spd/spd.h"
+
 void mainboard_memory_init_params(FSPM_UPD *mupd)
 {
 }
diff --git a/src/mainboard/intel/icelake_rvp/spd/spd_util.c b/src/mainboard/intel/icelake_rvp/spd/spd_util.c
index 6b733642cd..8d7eaf69ce 100644
--- a/src/mainboard/intel/icelake_rvp/spd/spd_util.c
+++ b/src/mainboard/intel/icelake_rvp/spd/spd_util.c
@@ -12,12 +12,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/byteorder.h>
 #include <arch/cpu.h>
-#include <console/console.h>
 #include <intelblocks/mp_init.h>
 #include <stdint.h>
 #include <string.h>
+
 #include "../board_id.h"
 #include "spd.h"
 
diff --git a/src/mainboard/intel/kblrvp/spd/spd_util.c b/src/mainboard/intel/kblrvp/spd/spd_util.c
index 12d9d10b36..10043843a2 100644
--- a/src/mainboard/intel/kblrvp/spd/spd_util.c
+++ b/src/mainboard/intel/kblrvp/spd/spd_util.c
@@ -12,12 +12,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/byteorder.h>
-#include <console/console.h>
 #include <stdint.h>
 #include <string.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
+
 #include "../board_id.h"
 #include "spd.h"
 
-- 
cgit v1.2.3