From b7959b592191fab82824e1b7ed29aa7e2299ed33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sun, 10 Sep 2017 23:41:31 +0300
Subject: [PATCH] AGESA boards: Drop heapManager.h includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1a96b1c6181cd657d7aee82370ef86acd688cc94
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21483
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/cpu/amd/agesa/heapmanager.c                     | 1 -
 src/mainboard/amd/bettong/BiosCallOuts.c            | 1 -
 src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c         | 1 -
 src/mainboard/amd/dinar/BiosCallOuts.c              | 1 -
 src/mainboard/amd/inagua/BiosCallOuts.c             | 1 -
 src/mainboard/amd/lamar/BiosCallOuts.c              | 1 -
 src/mainboard/amd/olivehill/BiosCallOuts.c          | 1 -
 src/mainboard/amd/olivehillplus/BiosCallOuts.c      | 1 -
 src/mainboard/amd/parmer/BiosCallOuts.c             | 1 -
 src/mainboard/amd/persimmon/BiosCallOuts.c          | 1 -
 src/mainboard/amd/south_station/BiosCallOuts.c      | 1 -
 src/mainboard/amd/thatcher/BiosCallOuts.c           | 1 -
 src/mainboard/amd/torpedo/BiosCallOuts.c            | 1 -
 src/mainboard/amd/union_station/BiosCallOuts.c      | 1 -
 src/mainboard/asrock/e350m1/BiosCallOuts.c          | 1 -
 src/mainboard/asrock/imb-a180/BiosCallOuts.c        | 1 -
 src/mainboard/bap/ode_e20XX/BiosCallOuts.c          | 1 -
 src/mainboard/bap/ode_e21XX/BiosCallOuts.c          | 1 -
 src/mainboard/biostar/am1ml/BiosCallOuts.c          | 1 -
 src/mainboard/elmex/pcm205400/BiosCallOuts.c        | 1 -
 src/mainboard/gizmosphere/gizmo/BiosCallOuts.c      | 1 -
 src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c     | 1 -
 src/mainboard/hp/abm/BiosCallOuts.c                 | 1 -
 src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c    | 1 -
 src/mainboard/lippert/frontrunner-af/BiosCallOuts.c | 1 -
 src/mainboard/lippert/toucan-af/BiosCallOuts.c      | 1 -
 src/mainboard/pcengines/apu1/BiosCallOuts.c         | 1 -
 src/mainboard/pcengines/apu2/BiosCallOuts.c         | 1 -
 src/mainboard/supermicro/h8qgi/BiosCallOuts.c       | 1 -
 src/mainboard/supermicro/h8scm/BiosCallOuts.c       | 1 -
 src/mainboard/tyan/s8226/BiosCallOuts.c             | 1 -
 src/northbridge/amd/agesa/state_machine.c           | 1 -
 32 files changed, 32 deletions(-)

diff --git a/src/cpu/amd/agesa/heapmanager.c b/src/cpu/amd/agesa/heapmanager.c
index 87864743bf..04775cd36e 100644
--- a/src/cpu/amd/agesa/heapmanager.c
+++ b/src/cpu/amd/agesa/heapmanager.c
@@ -14,7 +14,6 @@
 
 #include "AGESA.h"
 #include "amdlib.h"
-#include "heapManager.h"
 
 #include <cbmem.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/mainboard/amd/bettong/BiosCallOuts.c b/src/mainboard/amd/bettong/BiosCallOuts.c
index 8ea10d9080..4f66fad616 100644
--- a/src/mainboard/amd/bettong/BiosCallOuts.c
+++ b/src/mainboard/amd/bettong/BiosCallOuts.c
@@ -20,7 +20,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/pi/00660F01/chip.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c b/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c
index 5930a4f577..ceb295e5e4 100644
--- a/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c
+++ b/src/mainboard/amd/db-ft3b-lc/BiosCallOuts.c
@@ -19,7 +19,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <device/azalia.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/amd/dinar/BiosCallOuts.c b/src/mainboard/amd/dinar/BiosCallOuts.c
index 004fe3e607..e4ec12e4e1 100644
--- a/src/mainboard/amd/dinar/BiosCallOuts.c
+++ b/src/mainboard/amd/dinar/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/agesawrapper.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "SB700.h"
 #include "OEM.h"		/* SMBUS0_BASE_ADDRESS */
 #include <stdlib.h>
diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c
index 5d11c06dab..93e4277d45 100644
--- a/src/mainboard/amd/inagua/BiosCallOuts.c
+++ b/src/mainboard/amd/inagua/BiosCallOuts.c
@@ -16,7 +16,6 @@
 #include "AGESA.h"
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <southbridge/amd/cimx/sb800/gpio_oem.h>
 #include <stdlib.h>
diff --git a/src/mainboard/amd/lamar/BiosCallOuts.c b/src/mainboard/amd/lamar/BiosCallOuts.c
index 7a73ffee33..88e529999e 100644
--- a/src/mainboard/amd/lamar/BiosCallOuts.c
+++ b/src/mainboard/amd/lamar/BiosCallOuts.c
@@ -17,7 +17,6 @@
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/amd/olivehill/BiosCallOuts.c b/src/mainboard/amd/olivehill/BiosCallOuts.c
index 5cf3dd1da2..ad81edf152 100644
--- a/src/mainboard/amd/olivehill/BiosCallOuts.c
+++ b/src/mainboard/amd/olivehill/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/amd/olivehillplus/BiosCallOuts.c b/src/mainboard/amd/olivehillplus/BiosCallOuts.c
index 939f3bfa1b..49bc40224d 100644
--- a/src/mainboard/amd/olivehillplus/BiosCallOuts.c
+++ b/src/mainboard/amd/olivehillplus/BiosCallOuts.c
@@ -17,7 +17,6 @@
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c
index e76b28afba..dd7c6dd4b6 100644
--- a/src/mainboard/amd/parmer/BiosCallOuts.c
+++ b/src/mainboard/amd/parmer/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c
index 84ad355372..15cd1dfa2c 100644
--- a/src/mainboard/amd/persimmon/BiosCallOuts.c
+++ b/src/mainboard/amd/persimmon/BiosCallOuts.c
@@ -16,7 +16,6 @@
 #include "AGESA.h"
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <stdlib.h>
 
diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c
index bc2808660c..5b5e034d10 100644
--- a/src/mainboard/amd/south_station/BiosCallOuts.c
+++ b/src/mainboard/amd/south_station/BiosCallOuts.c
@@ -16,7 +16,6 @@
 #include "AGESA.h"
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <southbridge/amd/cimx/sb800/gpio_oem.h>
 #include <stdlib.h>
diff --git a/src/mainboard/amd/thatcher/BiosCallOuts.c b/src/mainboard/amd/thatcher/BiosCallOuts.c
index 82bb5c6579..3ab174c609 100644
--- a/src/mainboard/amd/thatcher/BiosCallOuts.c
+++ b/src/mainboard/amd/thatcher/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c
index 0035a27168..38206ff4a2 100644
--- a/src/mainboard/amd/torpedo/BiosCallOuts.c
+++ b/src/mainboard/amd/torpedo/BiosCallOuts.c
@@ -17,7 +17,6 @@
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "Hudson-2.h"
 #include <stdlib.h>
 #include <southbridge/amd/cimx/sb700/gpio_oem.h>
diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c
index bc2808660c..5b5e034d10 100644
--- a/src/mainboard/amd/union_station/BiosCallOuts.c
+++ b/src/mainboard/amd/union_station/BiosCallOuts.c
@@ -16,7 +16,6 @@
 #include "AGESA.h"
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <southbridge/amd/cimx/sb800/gpio_oem.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asrock/e350m1/BiosCallOuts.c b/src/mainboard/asrock/e350m1/BiosCallOuts.c
index 2e86ff6f3a..1f1e92926a 100644
--- a/src/mainboard/asrock/e350m1/BiosCallOuts.c
+++ b/src/mainboard/asrock/e350m1/BiosCallOuts.c
@@ -16,7 +16,6 @@
 #include "AGESA.h"
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <stdlib.h>
 
diff --git a/src/mainboard/asrock/imb-a180/BiosCallOuts.c b/src/mainboard/asrock/imb-a180/BiosCallOuts.c
index 9c316bdfe5..b2e6e42d9e 100644
--- a/src/mainboard/asrock/imb-a180/BiosCallOuts.c
+++ b/src/mainboard/asrock/imb-a180/BiosCallOuts.c
@@ -19,7 +19,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include <stdlib.h>
diff --git a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c
index b730e3500f..cb9f981c47 100644
--- a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c
+++ b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c
index 28e6e5a9a3..10015123d4 100644
--- a/src/mainboard/bap/ode_e21XX/BiosCallOuts.c
+++ b/src/mainboard/bap/ode_e21XX/BiosCallOuts.c
@@ -17,7 +17,6 @@
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/biostar/am1ml/BiosCallOuts.c b/src/mainboard/biostar/am1ml/BiosCallOuts.c
index 140e04e652..3cdd7274e2 100644
--- a/src/mainboard/biostar/am1ml/BiosCallOuts.c
+++ b/src/mainboard/biostar/am1ml/BiosCallOuts.c
@@ -20,7 +20,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include <stdlib.h>
diff --git a/src/mainboard/elmex/pcm205400/BiosCallOuts.c b/src/mainboard/elmex/pcm205400/BiosCallOuts.c
index bf762f10dc..ac8410bf35 100644
--- a/src/mainboard/elmex/pcm205400/BiosCallOuts.c
+++ b/src/mainboard/elmex/pcm205400/BiosCallOuts.c
@@ -16,7 +16,6 @@
 #include "AGESA.h"
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <stdlib.h>
 
diff --git a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
index 625eca13c5..d09ad0a5b2 100644
--- a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
+++ b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
@@ -16,7 +16,6 @@
 #include "AGESA.h"
 #include "amdlib.h"
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <stdlib.h>
 
diff --git a/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c
index f602119ae0..4fb7623745 100644
--- a/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c
+++ b/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "imc.h"
diff --git a/src/mainboard/hp/abm/BiosCallOuts.c b/src/mainboard/hp/abm/BiosCallOuts.c
index 729753dd8b..785fb96ffd 100644
--- a/src/mainboard/hp/abm/BiosCallOuts.c
+++ b/src/mainboard/hp/abm/BiosCallOuts.c
@@ -19,7 +19,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include <stdlib.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
index e3e34d3dc5..8cb67481be 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
@@ -17,7 +17,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 
 #include <amdlib.h>
-#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 #include <vendorcode/amd/cimx/sb800/SB800.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
index c950c9bfe3..9459d4ab75 100644
--- a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
+++ b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "SB800.h"
 #include <southbridge/amd/cimx/sb800/gpio_oem.h>
-#include "heapManager.h"
 #include <stdlib.h>
 
 /* Should AGESA_GNB_PCIE_SLOT_RESET use agesa_NoopSuccess?
diff --git a/src/mainboard/lippert/toucan-af/BiosCallOuts.c b/src/mainboard/lippert/toucan-af/BiosCallOuts.c
index 50f5904639..e8fdd7019f 100644
--- a/src/mainboard/lippert/toucan-af/BiosCallOuts.c
+++ b/src/mainboard/lippert/toucan-af/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "SB800.h"
 #include <southbridge/amd/cimx/sb800/gpio_oem.h>
-#include "heapManager.h"
 #include <stdlib.h>
 
 /* Should AGESA_GNB_PCIE_SLOT_RESET use agesa_NoopSuccess?
diff --git a/src/mainboard/pcengines/apu1/BiosCallOuts.c b/src/mainboard/pcengines/apu1/BiosCallOuts.c
index 7604277346..cded6c6d8a 100644
--- a/src/mainboard/pcengines/apu1/BiosCallOuts.c
+++ b/src/mainboard/pcengines/apu1/BiosCallOuts.c
@@ -17,7 +17,6 @@
 #include "amdlib.h"
 #include <spd_bin.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
-#include "heapManager.h"
 #include "SB800.h"
 #include <stdlib.h>
 #include "gpio_ftns.h"
diff --git a/src/mainboard/pcengines/apu2/BiosCallOuts.c b/src/mainboard/pcengines/apu2/BiosCallOuts.c
index 58227790c1..1dc0e1cbc3 100644
--- a/src/mainboard/pcengines/apu2/BiosCallOuts.c
+++ b/src/mainboard/pcengines/apu2/BiosCallOuts.c
@@ -19,7 +19,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
 #include "OptionsIds.h"
-#include "heapManager.h"
 #include "FchPlatform.h"
 #include "cbfs.h"
 #include "gpio_ftns.h"
diff --git a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
index 9a9156829e..9b742cb5ad 100644
--- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/agesawrapper.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include <arch/io.h>
 
 #ifdef __PRE_RAM__
diff --git a/src/mainboard/supermicro/h8scm/BiosCallOuts.c b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
index 2449b6c0e3..30c1198c7a 100644
--- a/src/mainboard/supermicro/h8scm/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/agesawrapper.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include <stdlib.h>
 
 const BIOS_CALLOUT_STRUCT BiosCallouts[] =
diff --git a/src/mainboard/tyan/s8226/BiosCallOuts.c b/src/mainboard/tyan/s8226/BiosCallOuts.c
index fea32cbddd..b7d263d44b 100644
--- a/src/mainboard/tyan/s8226/BiosCallOuts.c
+++ b/src/mainboard/tyan/s8226/BiosCallOuts.c
@@ -18,7 +18,6 @@
 #include <northbridge/amd/agesa/agesawrapper.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include "Ids.h"
-#include "heapManager.h"
 #include <arch/io.h>
 #include <stdlib.h>
 
diff --git a/src/northbridge/amd/agesa/state_machine.c b/src/northbridge/amd/agesa/state_machine.c
index d1570d3b45..015d445ab9 100644
--- a/src/northbridge/amd/agesa/state_machine.c
+++ b/src/northbridge/amd/agesa/state_machine.c
@@ -29,7 +29,6 @@
 #include <cpu/amd/agesa/s3_resume.h>
 
 #include "AMD.h"
-#include "heapManager.h"
 
 #if IS_ENABLED(CONFIG_CPU_AMD_AGESA_OPENSOURCE)
 #include "Dispatcher.h"