Patch set updated for coreboot: 5351fa4 northbridge/amd/agesa/family15tn: Sanitize #includes

[Alexandru Gagniuc]

Alexandru Gagniuc ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5422

-gerrit

commit 5351fa44f1699548b440001df6ee599f7ac76384
Author: Alexandru Gagniuc 
Date:   Sat Mar 29 17:19:50 2014 -0500

northbridge/amd/agesa/family15tn: Sanitize #includes

NOTFORMERGE:

Following the same reasoning as commit
    <HASH HERE> (pavilion) hp/pavilion_m6_1035dx: Sanitize #includes
    Clean up the #include directives in this northbridge code.

Change-Id: I8e27ddb9cbd1c9e5c2f15626815875047de18a0b
    Signed-off-by: Alexandru Gagniuc 
---
 src/northbridge/amd/agesa/family15tn/chip.h        |  2 ++
 src/northbridge/amd/agesa/family15tn/dimmSpd.c     | 12 +++-----
 src/northbridge/amd/agesa/family15tn/dimmSpd.h     |  2 ++
 .../amd/agesa/family15tn/fam15tn_callouts.c        | 14 +++++----
 .../amd/agesa/family15tn/fam15tn_callouts.h        |  3 +-
 src/northbridge/amd/agesa/family15tn/northbridge.c | 33 +++++++++++-----------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/northbridge/amd/agesa/family15tn/chip.h b/src/northbridge/amd/agesa/family15tn/chip.h
index 41571db..8a7ce9b 100644
--- a/src/northbridge/amd/agesa/family15tn/chip.h
+++ b/src/northbridge/amd/agesa/family15tn/chip.h
@@ -20,6 +20,8 @@
 #ifndef _AGESA_FAM15TN_CHIP_H_
 #define _AGESA_FAM15TN_CHIP_H_

+#include <stdint.h>
+
 struct northbridge_amd_agesa_family15tn_config
 {
    u8 spdAddrLookup[2][2][4];
diff --git a/src/northbridge/amd/agesa/family15tn/dimmSpd.c b/src/northbridge/amd/agesa/family15tn/dimmSpd.c
index 5b8a9b5..38eee7f 100644
--- a/src/northbridge/amd/agesa/family15tn/dimmSpd.c
+++ b/src/northbridge/amd/agesa/family15tn/dimmSpd.c
@@ -17,16 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */

-#include <device/pci_def.h>
-#include <device/device.h>
-
-/* warning: Porting.h includes an open #pragma pack(1) */
-#include "Porting.h"
-#include "AGESA.h"
-#include "amdlib.h"
-#include "dimmSpd.h"
 #include "chip.h"
+#include "dimmSpd.h"

+#include <device/pci_def.h>
+#include <device/device.h>
+#include <vendorcode/amd/agesa/f15tn/Lib/amdlib.h>

#define DIMENSION(array)(sizeof (array)/ sizeof (array [0]))

diff --git a/src/northbridge/amd/agesa/family15tn/dimmSpd.h b/src/northbridge/amd/agesa/family15tn/dimmSpd.h
index e50d53e..ac324cb 100644
--- a/src/northbridge/amd/agesa/family15tn/dimmSpd.h
+++ b/src/northbridge/amd/agesa/family15tn/dimmSpd.h
@@ -25,6 +25,8 @@
 #ifndef _DIMMSPD_H_
 #define _DIMMSPD_H_

+#include <vendorcode/amd/agesa/f15tn/AGESA.h>
+
 /*----------------------------------------------------------------------------------------
  *                   D E F I N I T I O N S    A N D    M A C R O S
  *----------------------------------------------------------------------------------------
diff --git a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c
index cf84b39..f907e02 100644
--- a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c
+++ b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.c
@@ -18,15 +18,17 @@
  */

#include "agesawrapper.h"
-#include "amdlib.h"
-#include "Ids.h"
-#include "OptionsIds.h"
-#include "heapManager.h"
-#include "FchPlatform.h"
-#include "cbfs.h"
 #include "dimmSpd.h"
 #include "fam15tn_callouts.h"
+
+#include <cbfs.h>
 #include <cbmem.h>
+#include <vendorcode/amd/agesa/f15tn/Include/Ids.h>
+#include <vendorcode/amd/agesa/f15tn/Lib/amdlib.h>
+#include <vendorcode/amd/agesa/f15tn/Proc/CPU/heapManager.h>
+#include <vendorcode/amd/agesa/f15tn/Proc/Fch/FchPlatform.h>
+#include <vendorcode/amd/agesa/f15tn/Proc/IDS/OptionsIds.h>
+

#define AGESA_RUNTIME_SIZE 4096

diff --git a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.h b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.h
index ff0cc44..7560230 100644
--- a/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.h
+++ b/src/northbridge/amd/agesa/family15tn/fam15tn_callouts.h
@@ -20,8 +20,7 @@
 #ifndef CALLOUTS_AMD_AGESA_FAM15TN_H
 #define CALLOUTS_AMD_AGESA_FAM15TN_H

-#include "Porting.h"
-#include "AGESA.h"
+#include <vendorcode/amd/agesa/f15tn/AGESA.h>

#define BIOS_HEAP_START_ADDRESS  0x010000000
 #define BIOS_HEAP_SIZE				0x30000
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index 2b5549d..1848210 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -17,30 +17,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */

-#include <console/console.h>
+#include "agesawrapper.h"
+#include "northbridge.h"
+
 #include <arch/io.h>
-#include <stdint.h>
+#include <console/console.h>
+#include <cbmem.h>
+#include <cpu/amd/amdfam15.h>
+#include <cpu/cpu.h>
+#include <cpu/x86/lapic.h>
+#include <cpu/amd/mtrr.h>
 #include <device/device.h>
+#include <device/hypertransport.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/hypertransport.h>
+#include <lib.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lib.h>
-#include <cpu/cpu.h>
-#include <cbmem.h>
-#include <AGESA.h>

-#include <cpu/x86/lapic.h>
-#include <cpu/amd/mtrr.h>
-
-#include <Porting.h>
-#include <Options.h>
-#include <Topology.h>
-#include <cpu/amd/amdfam15.h>
-#include <cpuRegisters.h>
-#include "agesawrapper.h"
-#include "northbridge.h"
+#include <vendorcode/amd/agesa/f15tn/AGESA.h>
+#include <vendorcode/amd/agesa/f15tn/Include/Options.h>
+#include <vendorcode/amd/agesa/f15tn/Include/Topology.h>
+#include <vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h>

#define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)