From e308cc6186e9768252d1e475624edd2426d7aac0 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Mon, 6 Aug 2018 12:51:39 +0200
Subject: mb: Get rid of unneeded include <cbmem.h>

Change-Id: I80dd65484fd52e9048635091fb20a123e959e999
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/27869
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/adi/rcc-dff/acpi_tables.c          | 1 -
 src/mainboard/amd/lamar/romstage.c               | 1 -
 src/mainboard/apple/macbook21/romstage.c         | 1 -
 src/mainboard/asrock/g41c-gs/romstage.c          | 1 -
 src/mainboard/asus/p5gc-mx/romstage.c            | 1 -
 src/mainboard/esd/atom15/acpi_tables.c           | 1 -
 src/mainboard/getac/p470/romstage.c              | 1 -
 src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c  | 1 -
 src/mainboard/gigabyte/ga-g41m-es2l/romstage.c   | 1 -
 src/mainboard/google/beltino/acpi_tables.c       | 1 -
 src/mainboard/google/butterfly/romstage.c        | 1 -
 src/mainboard/google/daisy/mainboard.c           | 1 -
 src/mainboard/google/jecht/acpi_tables.c         | 1 -
 src/mainboard/google/link/romstage.c             | 1 -
 src/mainboard/google/parrot/acpi_tables.c        | 1 -
 src/mainboard/google/parrot/romstage.c           | 1 -
 src/mainboard/google/peach_pit/mainboard.c       | 1 -
 src/mainboard/google/rambi/acpi_tables.c         | 1 -
 src/mainboard/google/stout/acpi_tables.c         | 1 -
 src/mainboard/google/stout/romstage.c            | 1 -
 src/mainboard/intel/baskingridge/acpi_tables.c   | 1 -
 src/mainboard/intel/bayleybay_fsp/acpi_tables.c  | 1 -
 src/mainboard/intel/bayleybay_fsp/romstage.c     | 1 -
 src/mainboard/intel/cougar_canyon2/acpi_tables.c | 1 -
 src/mainboard/intel/dg41wv/romstage.c            | 1 -
 src/mainboard/intel/emeraldlake2/acpi_tables.c   | 1 -
 src/mainboard/intel/emeraldlake2/romstage.c      | 1 -
 src/mainboard/intel/harcuvar/acpi_tables.c       | 1 -
 src/mainboard/intel/littleplains/acpi_tables.c   | 1 -
 src/mainboard/intel/minnowmax/acpi_tables.c      | 1 -
 src/mainboard/intel/mohonpeak/acpi_tables.c      | 1 -
 src/mainboard/intel/stargo2/acpi_tables.c        | 1 -
 src/mainboard/intel/stargo2/romstage.c           | 1 -
 src/mainboard/intel/strago/acpi_tables.c         | 1 -
 src/mainboard/intel/wtm2/acpi_tables.c           | 1 -
 src/mainboard/kontron/ktqm77/romstage.c          | 1 -
 src/mainboard/lenovo/t520/romstage.c             | 1 -
 src/mainboard/lenovo/t60/romstage.c              | 1 -
 src/mainboard/lenovo/x1_carbon_gen1/romstage.c   | 1 -
 src/mainboard/lenovo/x201/romstage.c             | 1 -
 src/mainboard/lenovo/x230/romstage.c             | 1 -
 src/mainboard/lenovo/x60/romstage.c              | 1 -
 src/mainboard/lenovo/z61t/romstage.c             | 1 -
 src/mainboard/packardbell/ms2290/romstage.c      | 1 -
 src/mainboard/roda/rk886ex/romstage.c            | 1 -
 src/mainboard/samsung/lumpy/acpi_tables.c        | 1 -
 src/mainboard/samsung/lumpy/romstage.c           | 1 -
 src/mainboard/samsung/stumpy/acpi_tables.c       | 1 -
 src/mainboard/samsung/stumpy/romstage.c          | 1 -
 src/mainboard/scaleway/tagada/acpi_tables.c      | 1 -
 src/mainboard/siemens/mc_tcu3/acpi_tables.c      | 1 -
 src/mainboard/siemens/mc_tcu3/romstage.c         | 1 -
 52 files changed, 52 deletions(-)

diff --git a/src/mainboard/adi/rcc-dff/acpi_tables.c b/src/mainboard/adi/rcc-dff/acpi_tables.c
index 0f99d9b698..fc1f5e4806 100644
--- a/src/mainboard/adi/rcc-dff/acpi_tables.c
+++ b/src/mainboard/adi/rcc-dff/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/amd/lamar/romstage.c b/src/mainboard/amd/lamar/romstage.c
index bbd5ad0528..d8930c3ee6 100644
--- a/src/mainboard/amd/lamar/romstage.c
+++ b/src/mainboard/amd/lamar/romstage.c
@@ -32,7 +32,6 @@
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_defs.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
-#include "cbmem.h"
 #include "superio/fintek/f81216h/f81216h.h"
 
 #define SERIAL_DEV PNP_DEV(0x4e, F81216H_SP1)
diff --git a/src/mainboard/apple/macbook21/romstage.c b/src/mainboard/apple/macbook21/romstage.c
index 79cc35dc6f..19e62d3ecc 100644
--- a/src/mainboard/apple/macbook21/romstage.c
+++ b/src/mainboard/apple/macbook21/romstage.c
@@ -25,7 +25,6 @@
 #include <cpu/intel/romstage.h>
 #include <cpu/x86/lapic.h>
 #include <lib.h>
-#include <cbmem.h>
 #include <timestamp.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
diff --git a/src/mainboard/asrock/g41c-gs/romstage.c b/src/mainboard/asrock/g41c-gs/romstage.c
index 49a44d9685..90df539066 100644
--- a/src/mainboard/asrock/g41c-gs/romstage.c
+++ b/src/mainboard/asrock/g41c-gs/romstage.c
@@ -27,7 +27,6 @@
 #include <superio/nuvoton/common/nuvoton.h>
 #include <lib.h>
 #include <arch/stages.h>
-#include <cbmem.h>
 #include <northbridge/intel/x4x/iomap.h>
 #include <device/pnp_def.h>
 #include <timestamp.h>
diff --git a/src/mainboard/asus/p5gc-mx/romstage.c b/src/mainboard/asus/p5gc-mx/romstage.c
index e1725d0de9..35f72081f5 100644
--- a/src/mainboard/asus/p5gc-mx/romstage.c
+++ b/src/mainboard/asus/p5gc-mx/romstage.c
@@ -25,7 +25,6 @@
 #include <cpu/x86/lapic.h>
 #include <lib.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <timestamp.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627dhg/w83627dhg.h>
diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index 6b97660038..f66dace788 100644
--- a/src/mainboard/esd/atom15/acpi_tables.c
+++ b/src/mainboard/esd/atom15/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <lib.h> // hexdump
 #include <console/console.h>
 #include <arch/acpi.h>
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index e58ef1bda6..749824725a 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -22,7 +22,6 @@
 #include <cpu/x86/lapic.h>
 #include <lib.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index 926a5a7f36..56ef561370 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <lib.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <timestamp.h>
 #include <superio/ite/it8718f/it8718f.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c b/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c
index ac336e45f7..13c888e108 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c
@@ -29,7 +29,6 @@
 #include <superio/ite/common/ite.h>
 #include <lib.h>
 #include <arch/stages.h>
-#include <cbmem.h>
 #include <northbridge/intel/x4x/iomap.h>
 #include <timestamp.h>
 
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 86a25fc64a..3e9f2adb8d 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <cbmem.h>
 #include <string.h>
 #include <types.h>
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index 3ef4659a5a..b6f926311e 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index b6c55181bd..52cb329af6 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -16,7 +16,6 @@
 #include <arch/cache.h>
 #include <boot/coreboot_tables.h>
 #include <console/console.h>
-#include <cbmem.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/i2c_simple.h>
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 0c6a37222d..cbea4c2c2d 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index d7bf7c1b63..e09525407e 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -25,7 +25,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index ae36ba0119..9330bd18c8 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index 782d6e5654..b5b084b456 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index d94b8c6550..10f150645b 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -15,7 +15,6 @@
 
 #include <arch/cache.h>
 #include <boot/coreboot_tables.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 9abdbf5337..f062a3ddf6 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 078cba2616..eb48cac2a8 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index f64e0120bd..20914ec7c0 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index e3a52faf1b..b9dd01578e 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index df7338b5fb..afc50a0991 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index 56ca33a0c5..d98802344c 100644
--- a/src/mainboard/intel/bayleybay_fsp/romstage.c
+++ b/src/mainboard/intel/bayleybay_fsp/romstage.c
@@ -21,7 +21,6 @@
 #include <arch/cbfs.h>
 #include <arch/stages.h>
 #include <console/console.h>
-#include <cbmem.h>
 #include <cpu/x86/mtrr.h>
 #include <romstage_handoff.h>
 #include <timestamp.h>
diff --git a/src/mainboard/intel/cougar_canyon2/acpi_tables.c b/src/mainboard/intel/cougar_canyon2/acpi_tables.c
index 406184f384..40771dfa5a 100644
--- a/src/mainboard/intel/cougar_canyon2/acpi_tables.c
+++ b/src/mainboard/intel/cougar_canyon2/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/acpigen.h>
diff --git a/src/mainboard/intel/dg41wv/romstage.c b/src/mainboard/intel/dg41wv/romstage.c
index ed2a23483f..b1df34961a 100644
--- a/src/mainboard/intel/dg41wv/romstage.c
+++ b/src/mainboard/intel/dg41wv/romstage.c
@@ -25,7 +25,6 @@
 #include <superio/winbond/common/winbond.h>
 #include <lib.h>
 #include <arch/stages.h>
-#include <cbmem.h>
 #include <northbridge/intel/x4x/iomap.h>
 #include <device/pnp_def.h>
 #include <timestamp.h>
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 92ded3c6da..b48e12b3ae 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/acpigen.h>
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index bdda191069..fcb2b2cc27 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <superio/smsc/sio1007/chip.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index acbdb3091c..4abde90c63 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -17,7 +17,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/intel/littleplains/acpi_tables.c b/src/mainboard/intel/littleplains/acpi_tables.c
index 0f99d9b698..fc1f5e4806 100644
--- a/src/mainboard/intel/littleplains/acpi_tables.c
+++ b/src/mainboard/intel/littleplains/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index 6b97660038..f66dace788 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <lib.h> // hexdump
 #include <console/console.h>
 #include <arch/acpi.h>
diff --git a/src/mainboard/intel/mohonpeak/acpi_tables.c b/src/mainboard/intel/mohonpeak/acpi_tables.c
index 0f99d9b698..fc1f5e4806 100644
--- a/src/mainboard/intel/mohonpeak/acpi_tables.c
+++ b/src/mainboard/intel/mohonpeak/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/intel/stargo2/acpi_tables.c b/src/mainboard/intel/stargo2/acpi_tables.c
index c2c729b473..54debd70e2 100644
--- a/src/mainboard/intel/stargo2/acpi_tables.c
+++ b/src/mainboard/intel/stargo2/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/intel/stargo2/romstage.c b/src/mainboard/intel/stargo2/romstage.c
index ff90e2e054..b873aca11f 100644
--- a/src/mainboard/intel/stargo2/romstage.c
+++ b/src/mainboard/intel/stargo2/romstage.c
@@ -26,7 +26,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/msr.h>
 #include <pc80/mc146818rtc.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <halt.h>
 #include <reset.h>
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index c6c9b52de9..f8dc821952 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index 35ba78e95c..a06a6e8c73 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 2a674a5374..32575c8f69 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c
index d7528404f8..9f0c4d9d65 100644
--- a/src/mainboard/lenovo/t520/romstage.c
+++ b/src/mainboard/lenovo/t520/romstage.c
@@ -26,7 +26,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index 18470ea3f8..af7998049a 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -25,7 +25,6 @@
 #include <cpu/x86/lapic.h>
 #include <lib.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <timestamp.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index 029d867b74..49ed6b2081 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
@@ -27,7 +27,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index d4c60dd521..1b49eb886e 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -34,7 +34,6 @@
 #include <delay.h>
 #include <timestamp.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 
 #include "dock.h"
 #include "arch/early_variables.h"
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 1a7decce59..fb0494c5aa 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -26,7 +26,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 0eac15a4ff..1cdce8c8aa 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -25,7 +25,6 @@
 #include <cpu/x86/lapic.h>
 #include <lib.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <timestamp.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/z61t/romstage.c b/src/mainboard/lenovo/z61t/romstage.c
index ffb72e3af1..cd5b25bad8 100644
--- a/src/mainboard/lenovo/z61t/romstage.c
+++ b/src/mainboard/lenovo/z61t/romstage.c
@@ -25,7 +25,6 @@
 #include <cpu/x86/lapic.h>
 #include <lib.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <timestamp.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 3538647e3f..676c051232 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -34,7 +34,6 @@
 #include <delay.h>
 #include <timestamp.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 
 #include "arch/early_variables.h"
 #include <southbridge/intel/ibexpeak/pch.h>
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index b4611f5bcc..7f233e829f 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <lib.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <timestamp.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 06fa0fd4f1..62284f1ef6 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/acpigen.h>
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index 3f655da936..ba25d54ace 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -25,7 +25,6 @@
 #include <pc80/mc146818rtc.h>
 #include <cbfs.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <bootmode.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index a518d18892..d57ec9d675 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/acpigen.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index ffaff42b72..5f56a3e1db 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <bootmode.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index acbdb3091c..4abde90c63 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -17,7 +17,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index df7338b5fb..afc50a0991 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c
index 15d949e2ec..628e88b9f1 100644
--- a/src/mainboard/siemens/mc_tcu3/romstage.c
+++ b/src/mainboard/siemens/mc_tcu3/romstage.c
@@ -21,7 +21,6 @@
 #include <arch/cbfs.h>
 #include <arch/stages.h>
 #include <console/console.h>
-#include <cbmem.h>
 #include <cpu/x86/mtrr.h>
 #include <romstage_handoff.h>
 #include <timestamp.h>
-- 
cgit v1.2.3