Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6262
-gerrit
commit dec2304c68ed84196313df7b15823203ec07c051 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Thu Jul 10 22:16:58 2014 +0300
AGESA: Drop some excessive agesawrapper.h includes
Change-Id: I3807912b1dc68fae8248a66e37bbe642fb92d3ae Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- 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 0f908cc..ed25f34 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 1899408..0990469 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 181f82c..c5267dc 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 a9fc2b0..f67d879 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 942115c..b2048ec 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 07fad8e..a02b92c 100644 --- a/src/mainboard/amd/olivehill/acpi_tables.c +++ b/src/mainboard/amd/olivehill/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <cpu/x86/msr.h> -#include "agesawrapper.h" #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h>
diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c index 6b75b21..ba80949 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 503ba48..e24ecc8 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 <console/console.h> #include <string.h> #include <arch/acpi.h> @@ -25,12 +27,9 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <cpu/x86/msr.h> -#include "agesawrapper.h" #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h>
-#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 21f8666..cfd9c6f 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 52dc8f5..6dfad31 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 ffb5f7c..c2234f7 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 503ba48..e24ecc8 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 <console/console.h> #include <string.h> #include <arch/acpi.h> @@ -25,12 +27,9 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <cpu/x86/msr.h> -#include "agesawrapper.h" #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h>
-#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 29625fc..8422f1d 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 52dc8f5..6dfad31 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 180708b..09571dd 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 c99f9d7..a61c37f 100644 --- a/src/mainboard/asrock/imb-a180/BiosCallOuts.c +++ b/src/mainboard/asrock/imb-a180/BiosCallOuts.c @@ -18,7 +18,7 @@ */
#include <device/azalia.h> -#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 41354fb..2c480c3 100644 --- a/src/mainboard/asrock/imb-a180/acpi_tables.c +++ b/src/mainboard/asrock/imb-a180/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <cpu/x86/msr.h> -#include "agesawrapper.h" #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h>
diff --git a/src/mainboard/asus/f2a85-m/BiosCallOuts.c b/src/mainboard/asus/f2a85-m/BiosCallOuts.c index e1bfabd..d1115dd 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 da21f57..9fd09e5 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 457c64e..e443e04 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 8553f88..b3199ca 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 <Lib/amdlib.h> diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c index af036e1..0264256 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 115d7df..f1ae168 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 039bbbf..6e6eb6a 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 574125d..5d0fd00 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 a1a8c11..ee64122 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 b679bae..cccce54 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"