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/google/beltino/smihandler.c             | 2 +-
 src/mainboard/google/daisy/chromeos.c                 | 1 -
 src/mainboard/google/dragonegg/romstage_fsp_params.c  | 1 -
 src/mainboard/google/foster/chromeos.c                | 1 -
 src/mainboard/google/gru/bootblock.c                  | 1 -
 src/mainboard/google/octopus/variants/phaser/gpio.c   | 1 -
 src/mainboard/google/peach_pit/chromeos.c             | 1 -
 src/mainboard/google/poppy/variants/nami/smihandler.c | 2 +-
 src/mainboard/google/urara/bootblock.c                | 1 +
 9 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/mainboard/google')

diff --git a/src/mainboard/google/beltino/smihandler.c b/src/mainboard/google/beltino/smihandler.c
index 1a03f2340b..e786ef56fd 100644
--- a/src/mainboard/google/beltino/smihandler.c
+++ b/src/mainboard/google/beltino/smihandler.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/acpi.h>
-#include <console/console.h>
 #include <cpu/intel/haswell/haswell.h>
 #include <cpu/x86/smm.h>
 #include <northbridge/intel/haswell/haswell.h>
@@ -24,6 +23,7 @@
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <elog.h>
 #include <superio/ite/it8772f/it8772f.h>
+
 #include "onboard.h"
 
 void mainboard_smi_sleep(u8 slp_typ)
diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c
index c06f8394eb..968f1f9d5b 100644
--- a/src/mainboard/google/daisy/chromeos.c
+++ b/src/mainboard/google/daisy/chromeos.c
@@ -14,7 +14,6 @@
  */
 
 #include <boot/coreboot_tables.h>
-#include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
 #include <soc/cpu.h>
diff --git a/src/mainboard/google/dragonegg/romstage_fsp_params.c b/src/mainboard/google/dragonegg/romstage_fsp_params.c
index e866c620d9..e357ee78c0 100644
--- a/src/mainboard/google/dragonegg/romstage_fsp_params.c
+++ b/src/mainboard/google/dragonegg/romstage_fsp_params.c
@@ -15,7 +15,6 @@
 
 #include <assert.h>
 #include <baseboard/variants.h>
-#include <console/console.h>
 #include <soc/romstage.h>
 
 void mainboard_memory_init_params(FSPM_UPD *mupd)
diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c
index 026dd3e5dd..591cfd0025 100644
--- a/src/mainboard/google/foster/chromeos.c
+++ b/src/mainboard/google/foster/chromeos.c
@@ -15,7 +15,6 @@
  */
 
 #include <boot/coreboot_tables.h>
-#include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
 #include <gpio.h>
diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c
index 7c18e12fd1..79d9b0f640 100644
--- a/src/mainboard/google/gru/bootblock.c
+++ b/src/mainboard/google/gru/bootblock.c
@@ -16,7 +16,6 @@
 
 #include <device/mmio.h>
 #include <bootblock_common.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/grf.h>
 #include <gpio.h>
diff --git a/src/mainboard/google/octopus/variants/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c
index 076476bbdd..281bde06a4 100644
--- a/src/mainboard/google/octopus/variants/phaser/gpio.c
+++ b/src/mainboard/google/octopus/variants/phaser/gpio.c
@@ -19,7 +19,6 @@
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
-#include <console/console.h>
 
 #define SKU_UNKNOWN            0xFFFFFFFF
 
diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c
index 00dd1f3987..b2d90d9e90 100644
--- a/src/mainboard/google/peach_pit/chromeos.c
+++ b/src/mainboard/google/peach_pit/chromeos.c
@@ -15,7 +15,6 @@
 
 #include <boot/coreboot_tables.h>
 #include <bootmode.h>
-#include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
 #include <soc/cpu.h>
diff --git a/src/mainboard/google/poppy/variants/nami/smihandler.c b/src/mainboard/google/poppy/variants/nami/smihandler.c
index 6816508f24..61162b40b1 100644
--- a/src/mainboard/google/poppy/variants/nami/smihandler.c
+++ b/src/mainboard/google/poppy/variants/nami/smihandler.c
@@ -15,8 +15,8 @@
 
 #include <arch/acpi.h>
 #include <baseboard/variants.h>
-#include <console/console.h>
 #include <delay.h>
+
 #include "gpio.h"
 
 #define TOUCH_DISABLE         GPP_C3
diff --git a/src/mainboard/google/urara/bootblock.c b/src/mainboard/google/urara/bootblock.c
index 5b0b29d0f7..16e75809d3 100644
--- a/src/mainboard/google/urara/bootblock.c
+++ b/src/mainboard/google/urara/bootblock.c
@@ -14,6 +14,7 @@
  * GNU General Public License for more details.
  */
 
+#include <console/console.h>
 #include <device/mmio.h>
 #include <stdint.h>
 #include <soc/clocks.h>
-- 
cgit v1.2.3