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>
diff --git a/src/soc/amd/stoneyridge/hda.c b/src/soc/amd/stoneyridge/hda.c
index 89fc0fd..4d327590 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 5376786..dacff34 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 278f8a8..385936c 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 68c4715..0223278 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 d5d0a81..9cdedc0 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 f610f6a..585ac6b 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 6a71f1ee..8a3cfac 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 94a5a8e..2c02689 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 e2ff318..002d38c 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 8186cec..8271746 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 a92d7a9..26ca8fd 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 19189f9..d7c9952 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 3245a28..40d658c 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 72dbca5..891aaff 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 70afa0d..3b17745 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 bb438ed..00f3690 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 b1ead77..be46727 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 8fb731a..e1883f2 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 7e614c1..cffe71b 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 13fdaf6..3f9dcd0 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 aa36e29..3595676 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 0e0eb8b..26483fd 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 9580a5c..662b352 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 8b4c7b1..aba1123 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 4049c1e..17b173a 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 c0580650..b440d39 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 ca31d39..ffe3f5b 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 06b37e0..e6310c0 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 e7f81fc..5ff0872 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 f37d001..5b78df5 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 9eaa2cb..3dd46fb 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 813d5c6..21e069f 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 1626927..780695a 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 9a651ee..8d03c07 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 8df2341..dab31bf3 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 b5870d7..339d47b 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 2f8b826..59f8d1b 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 1178031..41dbb6c 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 2487cde..d96d410 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 124d767..01ff6b5 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 e6bb51f..6f2f00c 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 24dcf23..bdc3902 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 e41afa4..a95e2f7 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 3d1dd7b..73757f2 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 6aa66c7..5d872ec 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 8b840c9..a2887ac 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 2c4408fe..6a4c864 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 b05d29e..2bf2aec 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 bc8053c..56e9873 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 977a9e5..ea51744 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 31c77f5..d4fa4c7 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 493ed51..37ceb34 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 231e8b2..b8b9cef 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 50c3956..769c279 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 526f14e..f8617a8 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 001032a..d5a7255 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 b7cec3d..6fa8429 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 4b0bffd..fcca4ec 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 edbb3b9..47c86cb 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 cd095ff..0179bd6 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 c294a0c..b9b8ff0 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 4631591..c3f331f 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 02fe9ff..7308241 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 662116e..b74aa13 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 1542ccf..a93120d 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 7d3c714..f4ca5d1 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 3316027..bd5c6ce 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 7c25936..eb28ca6 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 234cd23..11f0c59 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 970173e..d75a33a 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 638c4b5..5a3a989 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 8bd6304..9d4c748 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 f7580b9..f83343b 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 295ef39..e239993 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 ede7b04..a933ef9 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 e66049e..c819823 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 c063e20..d8c1378 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 a168355..7e8e146 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 dd0c787..2bcc6b4 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>