From 526c2fb278c6c4eccebaaaea9e1f7a00358d10e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 10 Jul 2014 22:16:58 +0300 Subject: AGESA: Drop some excessive agesawrapper.h includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3807912b1dc68fae8248a66e37bbe642fb92d3ae Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6262 Tested-by: build bot (Jenkins) --- src/cpu/amd/agesa/heapmanager.c | 2 +- src/cpu/amd/agesa/s3_resume.c | 1 - src/mainboard/amd/dinar/BiosCallOuts.c | 2 +- src/mainboard/amd/inagua/BiosCallOuts.c | 2 +- src/mainboard/amd/olivehill/BiosCallOuts.c | 2 +- src/mainboard/amd/olivehill/acpi_tables.c | 1 - src/mainboard/amd/parmer/BiosCallOuts.c | 2 +- src/mainboard/amd/parmer/acpi_tables.c | 5 ++--- src/mainboard/amd/persimmon/BiosCallOuts.c | 2 +- src/mainboard/amd/south_station/BiosCallOuts.c | 2 +- src/mainboard/amd/thatcher/BiosCallOuts.c | 2 +- src/mainboard/amd/thatcher/acpi_tables.c | 5 ++--- src/mainboard/amd/torpedo/BiosCallOuts.c | 2 +- src/mainboard/amd/union_station/BiosCallOuts.c | 2 +- src/mainboard/asrock/e350m1/BiosCallOuts.c | 2 +- src/mainboard/asrock/imb-a180/BiosCallOuts.c | 2 +- src/mainboard/asrock/imb-a180/acpi_tables.c | 1 - src/mainboard/asus/f2a85-m/BiosCallOuts.c | 2 +- src/mainboard/gizmosphere/gizmo/BiosCallOuts.c | 2 +- src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c | 2 +- src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c | 2 +- src/mainboard/lippert/frontrunner-af/BiosCallOuts.c | 2 +- src/mainboard/lippert/toucan-af/BiosCallOuts.c | 2 +- src/mainboard/supermicro/h8qgi/BiosCallOuts.c | 2 +- src/mainboard/supermicro/h8scm/BiosCallOuts.c | 2 +- src/mainboard/tyan/s8226/BiosCallOuts.c | 2 +- src/northbridge/amd/agesa/def_callouts.h | 1 - 27 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/cpu/amd/agesa/heapmanager.c b/src/cpu/amd/agesa/heapmanager.c index 0f908ccde9..ed25f34772 100644 --- a/src/cpu/amd/agesa/heapmanager.c +++ b/src/cpu/amd/agesa/heapmanager.c @@ -1,5 +1,5 @@ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "northbridge/amd/agesa/def_callouts.h" #include "heapManager.h" diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c index 18994084c5..099046996b 100644 --- a/src/cpu/amd/agesa/s3_resume.c +++ b/src/cpu/amd/agesa/s3_resume.c @@ -33,7 +33,6 @@ #include "Porting.h" #include "BiosCallOuts.h" #include "s3_resume.h" -#include "agesawrapper.h" /* The size needs to be 4k aligned, which is the sector size of most flashes. */ #define S3_DATA_VOLATILE_SIZE 0x6000 diff --git a/src/mainboard/amd/dinar/BiosCallOuts.c b/src/mainboard/amd/dinar/BiosCallOuts.c index 181f82c0df..c5267dca72 100644 --- a/src/mainboard/amd/dinar/BiosCallOuts.c +++ b/src/mainboard/amd/dinar/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c index a9fc2b0b2d..f67d87902c 100644 --- a/src/mainboard/amd/inagua/BiosCallOuts.c +++ b/src/mainboard/amd/inagua/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/amd/olivehill/BiosCallOuts.c b/src/mainboard/amd/olivehill/BiosCallOuts.c index 942115c321..b2048eca48 100644 --- a/src/mainboard/amd/olivehill/BiosCallOuts.c +++ b/src/mainboard/amd/olivehill/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c index 07fad8eb1e..a02b92c472 100644 --- a/src/mainboard/amd/olivehill/acpi_tables.c +++ b/src/mainboard/amd/olivehill/acpi_tables.c @@ -25,7 +25,6 @@ #include #include #include -#include "agesawrapper.h" #include #include diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c index 6b75b21e71..ba80949a91 100644 --- a/src/mainboard/amd/parmer/BiosCallOuts.c +++ b/src/mainboard/amd/parmer/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c index 503ba48498..e24ecc862c 100644 --- a/src/mainboard/amd/parmer/acpi_tables.c +++ b/src/mainboard/amd/parmer/acpi_tables.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "agesawrapper.h" + #include #include #include @@ -25,12 +27,9 @@ #include #include #include -#include "agesawrapper.h" #include #include -#include "agesawrapper.h" - extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c index 21f86669c7..cfd9c6f35b 100644 --- a/src/mainboard/amd/persimmon/BiosCallOuts.c +++ b/src/mainboard/amd/persimmon/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c index 52dc8f5b00..6dfad31546 100644 --- a/src/mainboard/amd/south_station/BiosCallOuts.c +++ b/src/mainboard/amd/south_station/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/amd/thatcher/BiosCallOuts.c b/src/mainboard/amd/thatcher/BiosCallOuts.c index ffb5f7c173..c2234f79a5 100644 --- a/src/mainboard/amd/thatcher/BiosCallOuts.c +++ b/src/mainboard/amd/thatcher/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c index 503ba48498..e24ecc862c 100644 --- a/src/mainboard/amd/thatcher/acpi_tables.c +++ b/src/mainboard/amd/thatcher/acpi_tables.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "agesawrapper.h" + #include #include #include @@ -25,12 +27,9 @@ #include #include #include -#include "agesawrapper.h" #include #include -#include "agesawrapper.h" - extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c index 29625fc146..8422f1d68b 100644 --- a/src/mainboard/amd/torpedo/BiosCallOuts.c +++ b/src/mainboard/amd/torpedo/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c index 52dc8f5b00..6dfad31546 100644 --- a/src/mainboard/amd/union_station/BiosCallOuts.c +++ b/src/mainboard/amd/union_station/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/asrock/e350m1/BiosCallOuts.c b/src/mainboard/asrock/e350m1/BiosCallOuts.c index 180708bf92..09571dd8c3 100644 --- a/src/mainboard/asrock/e350m1/BiosCallOuts.c +++ b/src/mainboard/asrock/e350m1/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/asrock/imb-a180/BiosCallOuts.c b/src/mainboard/asrock/imb-a180/BiosCallOuts.c index c99f9d7396..a61c37f40a 100644 --- a/src/mainboard/asrock/imb-a180/BiosCallOuts.c +++ b/src/mainboard/asrock/imb-a180/BiosCallOuts.c @@ -18,7 +18,7 @@ */ #include -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c index 41354fb27a..2c480c3e9f 100644 --- a/src/mainboard/asrock/imb-a180/acpi_tables.c +++ b/src/mainboard/asrock/imb-a180/acpi_tables.c @@ -25,7 +25,6 @@ #include #include #include -#include "agesawrapper.h" #include #include diff --git a/src/mainboard/asus/f2a85-m/BiosCallOuts.c b/src/mainboard/asus/f2a85-m/BiosCallOuts.c index e1bfabd2e6..d1115dd564 100644 --- a/src/mainboard/asus/f2a85-m/BiosCallOuts.c +++ b/src/mainboard/asus/f2a85-m/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "BiosCallOuts.h" #include "OptionsIds.h" diff --git a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c index da21f57528..9fd09e593f 100755 --- a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c +++ b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c index 457c64ef07..e443e04772 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "BiosCallOuts.h" #include "OptionsIds.h" diff --git a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c index 8553f88ad7..b3199caad3 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c +++ b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "BiosCallOuts.h" #include diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c index af036e1f89..02642561c4 100644 --- a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c +++ b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/lippert/toucan-af/BiosCallOuts.c b/src/mainboard/lippert/toucan-af/BiosCallOuts.c index 115d7df8ee..f1ae168c18 100644 --- a/src/mainboard/lippert/toucan-af/BiosCallOuts.c +++ b/src/mainboard/lippert/toucan-af/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "heapManager.h" diff --git a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c index 039bbbf9c4..6e6eb6a79c 100644 --- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c +++ b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/supermicro/h8scm/BiosCallOuts.c b/src/mainboard/supermicro/h8scm/BiosCallOuts.c index 574125d2a4..5d0fd00c97 100644 --- a/src/mainboard/supermicro/h8scm/BiosCallOuts.c +++ b/src/mainboard/supermicro/h8scm/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/mainboard/tyan/s8226/BiosCallOuts.c b/src/mainboard/tyan/s8226/BiosCallOuts.c index a1a8c11c97..ee641221b3 100644 --- a/src/mainboard/tyan/s8226/BiosCallOuts.c +++ b/src/mainboard/tyan/s8226/BiosCallOuts.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "agesawrapper.h" +#include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" #include "Ids.h" diff --git a/src/northbridge/amd/agesa/def_callouts.h b/src/northbridge/amd/agesa/def_callouts.h index b679baebf6..cccce54a42 100644 --- a/src/northbridge/amd/agesa/def_callouts.h +++ b/src/northbridge/amd/agesa/def_callouts.h @@ -21,7 +21,6 @@ #ifndef CALLOUTS_AMD_AGESA_H #define CALLOUTS_AMD_AGESA_H -#include "agesawrapper.h" #include "Porting.h" #include "AGESA.h" -- cgit v1.2.3