From e9a0130879bca97462c6184f1d368f773e00e8a0 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Fri, 26 Oct 2018 15:06:33 +0200
Subject: src: Remove unneeded include <console/console.h>

Change-Id: I40f8b4c7cbc55e16929b1f40d18bb5a9c19845da
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29289
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/soc/amd/stoneyridge/hda.c                  | 1 -
 src/soc/amd/stoneyridge/sata.c                 | 1 -
 src/soc/amd/stoneyridge/sm.c                   | 1 -
 src/soc/broadcom/cygnus/ns16550.c              | 1 -
 src/soc/imgtec/pistachio/reset.c               | 1 -
 src/soc/imgtec/pistachio/uart.c                | 1 -
 src/soc/intel/apollolake/nhlt.c                | 1 -
 src/soc/intel/baytrail/chip.c                  | 1 -
 src/soc/intel/baytrail/ehci.c                  | 1 -
 src/soc/intel/baytrail/northcluster.c          | 1 -
 src/soc/intel/braswell/hda.c                   | 2 +-
 src/soc/intel/braswell/memmap.c                | 1 -
 src/soc/intel/braswell/northcluster.c          | 1 -
 src/soc/intel/braswell/tsc_freq.c              | 1 -
 src/soc/intel/broadwell/chip.c                 | 1 -
 src/soc/intel/broadwell/cpu_info.c             | 1 -
 src/soc/intel/broadwell/ehci.c                 | 1 -
 src/soc/intel/broadwell/ramstage.c             | 1 -
 src/soc/intel/broadwell/romstage/pch.c         | 1 -
 src/soc/intel/broadwell/romstage/smbus.c       | 1 -
 src/soc/intel/broadwell/romstage/stack.c       | 1 -
 src/soc/intel/broadwell/smbus.c                | 1 -
 src/soc/intel/broadwell/usb_debug.c            | 1 -
 src/soc/intel/broadwell/xhci.c                 | 1 -
 src/soc/intel/cannonlake/chip.c                | 1 -
 src/soc/intel/cannonlake/lpc.c                 | 1 -
 src/soc/intel/cannonlake/nhlt.c                | 1 -
 src/soc/intel/cannonlake/systemagent.c         | 1 -
 src/soc/intel/common/block/fast_spi/fast_spi.c | 1 -
 src/soc/intel/common/pch/lockdown/lockdown.c   | 1 -
 src/soc/intel/common/vbt.c                     | 1 -
 src/soc/intel/denverton_ns/memmap.c            | 1 -
 src/soc/intel/denverton_ns/soc_util.c          | 1 -
 src/soc/intel/denverton_ns/spi.c               | 1 -
 src/soc/intel/fsp_baytrail/romstage/pmc.c      | 1 -
 src/soc/intel/fsp_broadwell_de/smbus.c         | 1 -
 src/soc/intel/quark/chip.c                     | 1 -
 src/soc/intel/quark/fsp1_1.c                   | 2 +-
 src/soc/intel/quark/fsp2_0.c                   | 2 +-
 src/soc/intel/quark/northcluster.c             | 1 -
 src/soc/intel/quark/romstage/mtrr.c            | 1 -
 src/soc/intel/quark/romstage/pcie.c            | 1 -
 src/soc/intel/quark/sd.c                       | 1 -
 src/soc/intel/skylake/lpc.c                    | 1 -
 src/soc/intel/skylake/nhlt/da7219.c            | 1 -
 src/soc/intel/skylake/pei_data.c               | 1 -
 src/soc/intel/skylake/systemagent.c            | 1 -
 src/soc/mediatek/common/timer.c                | 1 -
 src/soc/mediatek/common/uart.c                 | 1 -
 src/soc/mediatek/mt8173/ddp.c                  | 1 -
 src/soc/mediatek/mt8173/gpio_init.c            | 2 +-
 src/soc/mediatek/mt8173/soc.c                  | 1 -
 src/soc/nvidia/tegra/gpio.c                    | 1 -
 src/soc/nvidia/tegra124/uart.c                 | 1 -
 src/soc/nvidia/tegra124/verstage.c             | 1 -
 src/soc/nvidia/tegra210/mipi-phy.c             | 2 +-
 src/soc/nvidia/tegra210/uart.c                 | 1 -
 src/soc/qualcomm/ipq40xx/uart.c                | 1 -
 src/soc/qualcomm/sdm845/gpio.c                 | 1 -
 src/soc/rockchip/common/gpio.c                 | 1 -
 src/soc/rockchip/common/pwm.c                  | 1 -
 src/soc/rockchip/common/vop.c                  | 1 -
 src/soc/rockchip/rk3288/bootblock.c            | 1 -
 src/soc/rockchip/rk3288/gpio.c                 | 1 -
 src/soc/rockchip/rk3288/tsadc.c                | 1 -
 src/soc/rockchip/rk3399/decompressor.c         | 1 -
 src/soc/rockchip/rk3399/gpio.c                 | 1 -
 src/soc/rockchip/rk3399/saradc.c               | 1 -
 src/soc/rockchip/rk3399/tsadc.c                | 1 -
 src/soc/samsung/exynos5250/clock_init.c        | 1 -
 src/soc/samsung/exynos5250/dmc_common.c        | 1 -
 src/soc/samsung/exynos5250/power.c             | 1 -
 src/soc/samsung/exynos5250/wakeup.c            | 1 -
 src/soc/samsung/exynos5420/clock_init.c        | 1 -
 src/soc/samsung/exynos5420/dmc_common.c        | 1 -
 src/soc/samsung/exynos5420/dmc_init_ddr3.c     | 1 -
 src/soc/samsung/exynos5420/pinmux.c            | 1 -
 src/soc/samsung/exynos5420/power.c             | 1 -
 src/soc/samsung/exynos5420/wakeup.c            | 1 -
 79 files changed, 5 insertions(+), 79 deletions(-)

(limited to 'src/soc')

diff --git a/src/soc/amd/stoneyridge/hda.c b/src/soc/amd/stoneyridge/hda.c
index 89fc0fdfff..4d3275902c 100644
--- a/src/soc/amd/stoneyridge/hda.c
+++ b/src/soc/amd/stoneyridge/hda.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/amd/stoneyridge/sata.c b/src/soc/amd/stoneyridge/sata.c
index 5376786a91..dacff346de 100644
--- a/src/soc/amd/stoneyridge/sata.c
+++ b/src/soc/amd/stoneyridge/sata.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <delay.h>
 #include <device/pci.h>
diff --git a/src/soc/amd/stoneyridge/sm.c b/src/soc/amd/stoneyridge/sm.c
index 278f8a8001..385936c941 100644
--- a/src/soc/amd/stoneyridge/sm.c
+++ b/src/soc/amd/stoneyridge/sm.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/broadcom/cygnus/ns16550.c b/src/soc/broadcom/cygnus/ns16550.c
index 68c4715cb3..0223278b04 100644
--- a/src/soc/broadcom/cygnus/ns16550.c
+++ b/src/soc/broadcom/cygnus/ns16550.c
@@ -18,7 +18,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <delay.h>
 #include <soc/ns16550.h>
diff --git a/src/soc/imgtec/pistachio/reset.c b/src/soc/imgtec/pistachio/reset.c
index d5d0a8188d..9cdedc0809 100644
--- a/src/soc/imgtec/pistachio/reset.c
+++ b/src/soc/imgtec/pistachio/reset.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <reset.h>
 
 #define PISTACHIO_WD_ADDR		0xB8102100
diff --git a/src/soc/imgtec/pistachio/uart.c b/src/soc/imgtec/pistachio/uart.c
index f610f6a05d..585ac6b99b 100644
--- a/src/soc/imgtec/pistachio/uart.c
+++ b/src/soc/imgtec/pistachio/uart.c
@@ -18,7 +18,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>
 #include <console/uart.h>
 #include <device/device.h>
 #include <delay.h>
diff --git a/src/soc/intel/apollolake/nhlt.c b/src/soc/intel/apollolake/nhlt.c
index 6a71f1ee7e..8a3cfac203 100644
--- a/src/soc/intel/apollolake/nhlt.c
+++ b/src/soc/intel/apollolake/nhlt.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <nhlt.h>
 #include <soc/nhlt.h>
 
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index 94a5a8ec14..2c026893b5 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <arch/pci_ops.h>
diff --git a/src/soc/intel/baytrail/ehci.c b/src/soc/intel/baytrail/ehci.c
index e2ff3189b2..002d38c633 100644
--- a/src/soc/intel/baytrail/ehci.c
+++ b/src/soc/intel/baytrail/ehci.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/acpi.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c
index 8186cecb6c..82717463fa 100644
--- a/src/soc/intel/baytrail/northcluster.c
+++ b/src/soc/intel/baytrail/northcluster.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/braswell/hda.c b/src/soc/intel/braswell/hda.c
index a92d7a9c8a..26ca8fdcf4 100644
--- a/src/soc/intel/braswell/hda.c
+++ b/src/soc/intel/braswell/hda.c
@@ -13,8 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index 19189f948e..d7c995290b 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -16,7 +16,6 @@
 
 #include <arch/io.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <fsp/memmap.h>
 #include <soc/iosf.h>
 #include <soc/smm.h>
diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index 3245a288db..40d658c4d4 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -16,7 +16,6 @@
 
 #include <arch/acpi.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/braswell/tsc_freq.c b/src/soc/intel/braswell/tsc_freq.c
index 72dbca5af9..891aaff7de 100644
--- a/src/soc/intel/braswell/tsc_freq.c
+++ b/src/soc/intel/braswell/tsc_freq.c
@@ -18,7 +18,6 @@
 #include <cpu/x86/tsc.h>
 #include <rules.h>
 #include <soc/msr.h>
-#include <console/console.h>
 #if ENV_RAMSTAGE
 #include <soc/ramstage.h>
 #else
diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c
index 70afa0d3cc..3b17745e35 100644
--- a/src/soc/intel/broadwell/chip.c
+++ b/src/soc/intel/broadwell/chip.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <soc/acpi.h>
diff --git a/src/soc/intel/broadwell/cpu_info.c b/src/soc/intel/broadwell/cpu_info.c
index bb438ed51f..00f3690d89 100644
--- a/src/soc/intel/broadwell/cpu_info.c
+++ b/src/soc/intel/broadwell/cpu_info.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <arch/cpu.h>
 #include <cpu/x86/msr.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/broadwell/ehci.c b/src/soc/intel/broadwell/ehci.c
index b1ead7783f..be4672704c 100644
--- a/src/soc/intel/broadwell/ehci.c
+++ b/src/soc/intel/broadwell/ehci.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/broadwell/ramstage.c b/src/soc/intel/broadwell/ramstage.c
index 8fb731a6ca..e1883f2ecd 100644
--- a/src/soc/intel/broadwell/ramstage.c
+++ b/src/soc/intel/broadwell/ramstage.c
@@ -15,7 +15,6 @@
 
 #include <arch/acpi.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/soc/intel/broadwell/romstage/pch.c b/src/soc/intel/broadwell/romstage/pch.c
index 7e614c1aa4..cffe71b8da 100644
--- a/src/soc/intel/broadwell/romstage/pch.c
+++ b/src/soc/intel/broadwell/romstage/pch.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/soc/intel/broadwell/romstage/smbus.c b/src/soc/intel/broadwell/romstage/smbus.c
index 13fdaf6105..3f9dcd0ab7 100644
--- a/src/soc/intel/broadwell/romstage/smbus.c
+++ b/src/soc/intel/broadwell/romstage/smbus.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <reg_script.h>
diff --git a/src/soc/intel/broadwell/romstage/stack.c b/src/soc/intel/broadwell/romstage/stack.c
index aa36e29ccf..35956760e0 100644
--- a/src/soc/intel/broadwell/romstage/stack.c
+++ b/src/soc/intel/broadwell/romstage/stack.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <arch/cpu.h>
 #include <arch/early_variables.h>
-#include <console/console.h>
 #include <cbmem.h>
 #include <cpu/x86/mtrr.h>
 #include <soc/romstage.h>
diff --git a/src/soc/intel/broadwell/smbus.c b/src/soc/intel/broadwell/smbus.c
index 0e0eb8b883..26483fd2bc 100644
--- a/src/soc/intel/broadwell/smbus.c
+++ b/src/soc/intel/broadwell/smbus.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/smbus.h>
diff --git a/src/soc/intel/broadwell/usb_debug.c b/src/soc/intel/broadwell/usb_debug.c
index 9580a5c90d..662b35216d 100644
--- a/src/soc/intel/broadwell/usb_debug.c
+++ b/src/soc/intel/broadwell/usb_debug.c
@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
 
diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c
index 8b4c7b1b5e..aba1123492 100644
--- a/src/soc/intel/broadwell/xhci.c
+++ b/src/soc/intel/broadwell/xhci.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index 4049c1e78c..17b173aec6 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -14,7 +14,6 @@
  */
 
 #include <chip.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/api.h>
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index c058065043..b440d392e4 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -16,7 +16,6 @@
  */
 
 #include "chip.h"
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/cannonlake/nhlt.c b/src/soc/intel/cannonlake/nhlt.c
index ca31d39574..ffe3f5bf6a 100644
--- a/src/soc/intel/cannonlake/nhlt.c
+++ b/src/soc/intel/cannonlake/nhlt.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <nhlt.h>
 #include <soc/nhlt.h>
 
diff --git a/src/soc/intel/cannonlake/systemagent.c b/src/soc/intel/cannonlake/systemagent.c
index 06b37e0a92..e6310c0c9a 100644
--- a/src/soc/intel/cannonlake/systemagent.c
+++ b/src/soc/intel/cannonlake/systemagent.c
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <intelblocks/systemagent.h>
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c
index e7f81fc323..5ff0872a4f 100644
--- a/src/soc/intel/common/block/fast_spi/fast_spi.c
+++ b/src/soc/intel/common/block/fast_spi/fast_spi.c
@@ -18,7 +18,6 @@
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <commonlib/helpers.h>
-#include <console/console.h>
 #include <cpu/x86/mtrr.h>
 #include <fast_spi_def.h>
 #include <intelblocks/fast_spi.h>
diff --git a/src/soc/intel/common/pch/lockdown/lockdown.c b/src/soc/intel/common/pch/lockdown/lockdown.c
index f37d00117e..5b78df5a6c 100644
--- a/src/soc/intel/common/pch/lockdown/lockdown.c
+++ b/src/soc/intel/common/pch/lockdown/lockdown.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <bootstate.h>
-#include <console/console.h>
 #include <intelblocks/chip.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/pcr.h>
diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c
index 9eaa2cb048..3dd46fb5f8 100644
--- a/src/soc/intel/common/vbt.c
+++ b/src/soc/intel/common/vbt.c
@@ -14,7 +14,6 @@
  */
 
 #include <cbfs.h>
-#include <console/console.h>
 #include <arch/acpi.h>
 #include <bootmode.h>
 #include <bootstate.h>
diff --git a/src/soc/intel/denverton_ns/memmap.c b/src/soc/intel/denverton_ns/memmap.c
index 813d5c6553..21e069fc95 100644
--- a/src/soc/intel/denverton_ns/memmap.c
+++ b/src/soc/intel/denverton_ns/memmap.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <console/console.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
 #include <soc/smm.h>
diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c
index 1626927ef2..780695a573 100644
--- a/src/soc/intel/denverton_ns/soc_util.c
+++ b/src/soc/intel/denverton_ns/soc_util.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/device.h>
-#include <console/console.h>
 
 #include <soc/iomap.h>
 #include <soc/soc_util.h>
diff --git a/src/soc/intel/denverton_ns/spi.c b/src/soc/intel/denverton_ns/spi.c
index 9a651ee048..8d03c07f64 100644
--- a/src/soc/intel/denverton_ns/spi.c
+++ b/src/soc/intel/denverton_ns/spi.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <intelblocks/fast_spi.h>
 #include <spi-generic.h>
 
diff --git a/src/soc/intel/fsp_baytrail/romstage/pmc.c b/src/soc/intel/fsp_baytrail/romstage/pmc.c
index 8df2341947..dab31bf314 100644
--- a/src/soc/intel/fsp_baytrail/romstage/pmc.c
+++ b/src/soc/intel/fsp_baytrail/romstage/pmc.c
@@ -15,7 +15,6 @@
 
 #include <stddef.h>
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/fsp_broadwell_de/smbus.c b/src/soc/intel/fsp_broadwell_de/smbus.c
index b5870d77cf..339d47be8b 100644
--- a/src/soc/intel/fsp_broadwell_de/smbus.c
+++ b/src/soc/intel/fsp_broadwell_de/smbus.c
@@ -16,7 +16,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/smbus.h>
 #include <device/smbus_def.h>
diff --git a/src/soc/intel/quark/chip.c b/src/soc/intel/quark/chip.c
index 2f8b8267d1..59f8d1b474 100644
--- a/src/soc/intel/quark/chip.c
+++ b/src/soc/intel/quark/chip.c
@@ -15,7 +15,6 @@
  */
 
 #include <assert.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <romstage_handoff.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/quark/fsp1_1.c b/src/soc/intel/quark/fsp1_1.c
index 1178031f8d..41dbb6c594 100644
--- a/src/soc/intel/quark/fsp1_1.c
+++ b/src/soc/intel/quark/fsp1_1.c
@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <fsp/util.h>
 #include <soc/ramstage.h>
 
diff --git a/src/soc/intel/quark/fsp2_0.c b/src/soc/intel/quark/fsp2_0.c
index 2487cdebd3..d96d410f9a 100644
--- a/src/soc/intel/quark/fsp2_0.c
+++ b/src/soc/intel/quark/fsp2_0.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <fsp/util.h>
 #include <soc/ramstage.h>
 
diff --git a/src/soc/intel/quark/northcluster.c b/src/soc/intel/quark/northcluster.c
index 124d767d13..01ff6b522e 100644
--- a/src/soc/intel/quark/northcluster.c
+++ b/src/soc/intel/quark/northcluster.c
@@ -16,7 +16,6 @@
  */
 
 #include <cbmem.h>
-#include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/quark/romstage/mtrr.c b/src/soc/intel/quark/romstage/mtrr.c
index e6bb51fd25..6f2f00c862 100644
--- a/src/soc/intel/quark/romstage/mtrr.c
+++ b/src/soc/intel/quark/romstage/mtrr.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <soc/intel/common/util.h>
diff --git a/src/soc/intel/quark/romstage/pcie.c b/src/soc/intel/quark/romstage/pcie.c
index 24dcf23ffb..bdc3902e6c 100644
--- a/src/soc/intel/quark/romstage/pcie.c
+++ b/src/soc/intel/quark/romstage/pcie.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/quark/sd.c b/src/soc/intel/quark/sd.c
index e41afa4acd..a95e2f7272 100644
--- a/src/soc/intel/quark/sd.c
+++ b/src/soc/intel/quark/sd.c
@@ -16,7 +16,6 @@
 #include <arch/io.h>
 #include <commonlib/sdhci.h>
 #include <commonlib/storage.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index 3d1dd7b024..73757f25f0 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -16,7 +16,6 @@
  */
 
 #include "chip.h"
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/skylake/nhlt/da7219.c b/src/soc/intel/skylake/nhlt/da7219.c
index 6aa66c73c2..5d872ecff7 100644
--- a/src/soc/intel/skylake/nhlt/da7219.c
+++ b/src/soc/intel/skylake/nhlt/da7219.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <nhlt.h>
 #include <soc/nhlt.h>
 
diff --git a/src/soc/intel/skylake/pei_data.c b/src/soc/intel/skylake/pei_data.c
index 8b840c9853..a2887ac4c4 100644
--- a/src/soc/intel/skylake/pei_data.c
+++ b/src/soc/intel/skylake/pei_data.c
@@ -15,7 +15,6 @@
  */
 
 #include <chip.h>
-#include <console/console.h>
 #include <console/streams.h>
 #include <device/device.h>
 #include <device/pci_def.h>
diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c
index 2c4408fec6..6a4c8646ce 100644
--- a/src/soc/intel/skylake/systemagent.c
+++ b/src/soc/intel/skylake/systemagent.c
@@ -17,7 +17,6 @@
 
 #include <arch/io.h>
 #include <cpu/x86/msr.h>
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
diff --git a/src/soc/mediatek/common/timer.c b/src/soc/mediatek/common/timer.c
index b05d29e0bf..2bf2aece9f 100644
--- a/src/soc/mediatek/common/timer.c
+++ b/src/soc/mediatek/common/timer.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <timer.h>
 #include <delay.h>
 #include <thread.h>
diff --git a/src/soc/mediatek/common/uart.c b/src/soc/mediatek/common/uart.c
index bc8053c6ab..56e98739cd 100644
--- a/src/soc/mediatek/common/uart.c
+++ b/src/soc/mediatek/common/uart.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 #include <stdint.h>
diff --git a/src/soc/mediatek/mt8173/ddp.c b/src/soc/mediatek/mt8173/ddp.c
index 977a9e5fe8..ea517449ce 100644
--- a/src/soc/mediatek/mt8173/ddp.c
+++ b/src/soc/mediatek/mt8173/ddp.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <edid.h>
 #include <stdlib.h>
diff --git a/src/soc/mediatek/mt8173/gpio_init.c b/src/soc/mediatek/mt8173/gpio_init.c
index 31c77f5240..d4fa4c7d7c 100644
--- a/src/soc/mediatek/mt8173/gpio_init.c
+++ b/src/soc/mediatek/mt8173/gpio_init.c
@@ -12,8 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/io.h>
-#include <console/console.h>
 #include <soc/gpio.h>
 #include <soc/mipi.h>
 
diff --git a/src/soc/mediatek/mt8173/soc.c b/src/soc/mediatek/mt8173/soc.c
index 493ed51e8b..37ceb34fd4 100644
--- a/src/soc/mediatek/mt8173/soc.c
+++ b/src/soc/mediatek/mt8173/soc.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <symbols.h>
 #include <soc/emi.h>
diff --git a/src/soc/nvidia/tegra/gpio.c b/src/soc/nvidia/tegra/gpio.c
index 231e8b21ad..b8b9cefdf0 100644
--- a/src/soc/nvidia/tegra/gpio.c
+++ b/src/soc/nvidia/tegra/gpio.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/addressmap.h>
 #include <stddef.h>
diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c
index 50c395658a..769c279202 100644
--- a/src/soc/nvidia/tegra124/uart.c
+++ b/src/soc/nvidia/tegra124/uart.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 
diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c
index 526f14e066..f8617a8166 100644
--- a/src/soc/nvidia/tegra124/verstage.c
+++ b/src/soc/nvidia/tegra124/verstage.c
@@ -17,7 +17,6 @@
 #include <arch/exception.h>
 #include <arch/hlt.h>
 #include <arch/stages.h>
-#include <console/console.h>
 #include <program_loading.h>
 #include <soc/cache.h>
 #include <soc/early_configs.h>
diff --git a/src/soc/nvidia/tegra210/mipi-phy.c b/src/soc/nvidia/tegra210/mipi-phy.c
index 001032a591..d5a7255ed4 100644
--- a/src/soc/nvidia/tegra210/mipi-phy.c
+++ b/src/soc/nvidia/tegra210/mipi-phy.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <arch/io.h>
 #include <stdint.h>
 #include <lib.h>
diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c
index b7cec3d171..6fa8429cf1 100644
--- a/src/soc/nvidia/tegra210/uart.c
+++ b/src/soc/nvidia/tegra210/uart.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 #include <stdint.h>
diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c
index 4b0bffd216..fcca4ec526 100644
--- a/src/soc/qualcomm/ipq40xx/uart.c
+++ b/src/soc/qualcomm/ipq40xx/uart.c
@@ -30,7 +30,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>
 #include <console/uart.h>
 #include <delay.h>
 #include <gpio.h>
diff --git a/src/soc/qualcomm/sdm845/gpio.c b/src/soc/qualcomm/sdm845/gpio.c
index edbb3b98fa..47c86cbb59 100644
--- a/src/soc/qualcomm/sdm845/gpio.c
+++ b/src/soc/qualcomm/sdm845/gpio.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <types.h>
-#include <console/console.h>
 #include <delay.h>
 #include <timer.h>
 #include <timestamp.h>
diff --git a/src/soc/rockchip/common/gpio.c b/src/soc/rockchip/common/gpio.c
index cd095ff374..0179bd64ea 100644
--- a/src/soc/rockchip/common/gpio.c
+++ b/src/soc/rockchip/common/gpio.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/common/pwm.c b/src/soc/rockchip/common/pwm.c
index c294a0cdf2..b9b8ff041a 100644
--- a/src/soc/rockchip/common/pwm.c
+++ b/src/soc/rockchip/common/pwm.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/addressmap.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/common/vop.c b/src/soc/rockchip/common/vop.c
index 463159182a..c3f331f6df 100644
--- a/src/soc/rockchip/common/vop.c
+++ b/src/soc/rockchip/common/vop.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 02fe9ff885..7308241e17 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -16,7 +16,6 @@
 #include <arch/cache.h>
 #include <arch/io.h>
 #include <bootblock_common.h>
-#include <console/console.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3288/gpio.c b/src/soc/rockchip/rk3288/gpio.c
index 662116ecb5..b74aa13adb 100644
--- a/src/soc/rockchip/rk3288/gpio.c
+++ b/src/soc/rockchip/rk3288/gpio.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3288/tsadc.c b/src/soc/rockchip/rk3288/tsadc.c
index 1542ccf7e8..a93120d0f5 100644
--- a/src/soc/rockchip/rk3288/tsadc.c
+++ b/src/soc/rockchip/rk3288/tsadc.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3399/decompressor.c b/src/soc/rockchip/rk3399/decompressor.c
index 7d3c71478b..f4ca5d111f 100644
--- a/src/soc/rockchip/rk3399/decompressor.c
+++ b/src/soc/rockchip/rk3399/decompressor.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <arch/mmu.h>
 #include <bootblock_common.h>
-#include <console/console.h>
 #include <soc/mmu_operations.h>
 #include <symbols.h>
 
diff --git a/src/soc/rockchip/rk3399/gpio.c b/src/soc/rockchip/rk3399/gpio.c
index 3316027d4a..bd5c6ce6bc 100644
--- a/src/soc/rockchip/rk3399/gpio.c
+++ b/src/soc/rockchip/rk3399/gpio.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/gpio.h>
diff --git a/src/soc/rockchip/rk3399/saradc.c b/src/soc/rockchip/rk3399/saradc.c
index 7c25936e20..eb28ca613f 100644
--- a/src/soc/rockchip/rk3399/saradc.c
+++ b/src/soc/rockchip/rk3399/saradc.c
@@ -16,7 +16,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clock.h>
 #include <soc/saradc.h>
diff --git a/src/soc/rockchip/rk3399/tsadc.c b/src/soc/rockchip/rk3399/tsadc.c
index 234cd23377..11f0c59c5f 100644
--- a/src/soc/rockchip/rk3399/tsadc.c
+++ b/src/soc/rockchip/rk3399/tsadc.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
diff --git a/src/soc/samsung/exynos5250/clock_init.c b/src/soc/samsung/exynos5250/clock_init.c
index 970173e3b3..d75a33ae31 100644
--- a/src/soc/samsung/exynos5250/clock_init.c
+++ b/src/soc/samsung/exynos5250/clock_init.c
@@ -16,7 +16,6 @@
 /* Clock setup for SMDK5250 board based on EXYNOS5 */
 
 #include <delay.h>
-#include <console/console.h>
 #include <soc/clk.h>
 #include <soc/dp.h>
 #include <soc/setup.h>
diff --git a/src/soc/samsung/exynos5250/dmc_common.c b/src/soc/samsung/exynos5250/dmc_common.c
index 638c4b5f46..5a3a98994b 100644
--- a/src/soc/samsung/exynos5250/dmc_common.c
+++ b/src/soc/samsung/exynos5250/dmc_common.c
@@ -17,7 +17,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5250/power.c b/src/soc/samsung/exynos5250/power.c
index 8bd63044cb..9d4c748d21 100644
--- a/src/soc/samsung/exynos5250/power.c
+++ b/src/soc/samsung/exynos5250/power.c
@@ -16,7 +16,6 @@
 /* Power setup code for EXYNOS5 */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <halt.h>
 #include <reset.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5250/wakeup.c b/src/soc/samsung/exynos5250/wakeup.c
index f7580b9a16..f83343bcff 100644
--- a/src/soc/samsung/exynos5250/wakeup.c
+++ b/src/soc/samsung/exynos5250/wakeup.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <soc/power.h>
 #include <soc/wakeup.h>
 
diff --git a/src/soc/samsung/exynos5420/clock_init.c b/src/soc/samsung/exynos5420/clock_init.c
index 295ef399c2..e239993b32 100644
--- a/src/soc/samsung/exynos5420/clock_init.c
+++ b/src/soc/samsung/exynos5420/clock_init.c
@@ -15,7 +15,6 @@
 
 /* Clock setup for SMDK5420 board based on EXYNOS5 */
 
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/cpu.h>
diff --git a/src/soc/samsung/exynos5420/dmc_common.c b/src/soc/samsung/exynos5420/dmc_common.c
index ede7b042f2..a933ef996c 100644
--- a/src/soc/samsung/exynos5420/dmc_common.c
+++ b/src/soc/samsung/exynos5420/dmc_common.c
@@ -17,7 +17,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5420/dmc_init_ddr3.c b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
index e66049e185..c81982377e 100644
--- a/src/soc/samsung/exynos5420/dmc_init_ddr3.c
+++ b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
@@ -17,7 +17,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5420/pinmux.c b/src/soc/samsung/exynos5420/pinmux.c
index c063e20d77..d8c13780a4 100644
--- a/src/soc/samsung/exynos5420/pinmux.c
+++ b/src/soc/samsung/exynos5420/pinmux.c
@@ -14,7 +14,6 @@
  */
 
 #include <assert.h>
-#include <console/console.h>
 #include <soc/gpio.h>
 #include <soc/pinmux.h>
 #include <stdlib.h>
diff --git a/src/soc/samsung/exynos5420/power.c b/src/soc/samsung/exynos5420/power.c
index a168355f14..7e8e146b63 100644
--- a/src/soc/samsung/exynos5420/power.c
+++ b/src/soc/samsung/exynos5420/power.c
@@ -16,7 +16,6 @@
 /* Power setup code for EXYNOS5 */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <halt.h>
 #include <soc/dmc.h>
 #include <soc/power.h>
diff --git a/src/soc/samsung/exynos5420/wakeup.c b/src/soc/samsung/exynos5420/wakeup.c
index dd0c7878f2..2bcc6b4b5e 100644
--- a/src/soc/samsung/exynos5420/wakeup.c
+++ b/src/soc/samsung/exynos5420/wakeup.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/cache.h>
-#include <console/console.h>
 #include <soc/power.h>
 #include <soc/wakeup.h>
 
-- 
cgit v1.2.3