From 6d2a92712445d92a48e7a3126f2e402f8db1a520 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Thu, 12 Jul 2007 01:26:43 +0000
Subject: [PATCH] Remove some include files which are not required (and add
 some which are).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Peter Stuge <peter@stuge.se>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@448 f3766cd6-281f-0410-b1cd-43a5c92072e9
---
 arch/x86/geodelx/cpu.c                 | 2 +-
 arch/x86/geodelx/geodelx.c             | 3 ---
 arch/x86/geodelx/stage1.c              | 6 ------
 include/arch/x86/amd_geodelx.h         | 5 +++++
 northbridge/amd/geodelx/geodelx.c      | 4 ----
 northbridge/amd/geodelx/geodelxinit.c  | 5 -----
 northbridge/amd/geodelx/raminit.c      | 3 ---
 northbridge/amd/geodelx/raminit.h      | 7 +++++++
 southbridge/amd/cs5536/cs5536.c        | 5 +----
 southbridge/amd/cs5536/smbus_initram.c | 1 +
 southbridge/amd/cs5536/stage1.c        | 3 +--
 11 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/arch/x86/geodelx/cpu.c b/arch/x86/geodelx/cpu.c
index 0ce291d8af..0a80d95251 100644
--- a/arch/x86/geodelx/cpu.c
+++ b/arch/x86/geodelx/cpu.c
@@ -29,7 +29,6 @@
  */
 
 #include <console.h>
-#include <string.h>
 #include <device/device.h>
 #include <lib.h>
 #include <io.h>
@@ -103,5 +102,6 @@ struct constructor geodelx_constructors[] = {
 		/* TODO: This is incorrect, these are _not_ PCI IDs! */
 		.u = {.pci = {.vendor = X86_VENDOR_AMD,.device = 0x05A2}}},
 	 .ops = &geodelx_cpuops},
+
 	{.ops = 0},
 };
diff --git a/arch/x86/geodelx/geodelx.c b/arch/x86/geodelx/geodelx.c
index af2c3b8f8e..a8b6c82fd8 100644
--- a/arch/x86/geodelx/geodelx.c
+++ b/arch/x86/geodelx/geodelx.c
@@ -23,9 +23,6 @@
 #include <types.h>
 #include <lib.h>
 #include <console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <string.h>
 #include <msr.h>
 #include <io.h>
 #include <hlt.h>
diff --git a/arch/x86/geodelx/stage1.c b/arch/x86/geodelx/stage1.c
index 2e83c34c86..3297c95a9d 100644
--- a/arch/x86/geodelx/stage1.c
+++ b/arch/x86/geodelx/stage1.c
@@ -20,14 +20,8 @@
 
 #include <types.h>
 #include <lib.h>
-#include <console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <string.h>
 #include <msr.h>
-#include <io.h>
 #include <amd_geodelx.h>
-#include <spd.h>
 
 static struct msrinit {
 	u32 msrnum;
diff --git a/include/arch/x86/amd_geodelx.h b/include/arch/x86/amd_geodelx.h
index d3f6c4e1ce..eb87efd8e3 100644
--- a/include/arch/x86/amd_geodelx.h
+++ b/include/arch/x86/amd_geodelx.h
@@ -25,6 +25,11 @@
 #ifndef CPU_AMD_LXDEF_H
 #define CPU_AMD_LXDEF_H
 
+#ifndef __ASSEMBLER__
+#include <types.h>
+#include <io.h>
+#endif
+
 #define CPU_ID_1_X				0x00000560	/* Stepping ID 1.x CPUbug fix to change it to 5A0 */
 #define CPU_ID_2_0				0x000005A1
 #define CPU_ID_3_0				0x000005A2
diff --git a/northbridge/amd/geodelx/geodelx.c b/northbridge/amd/geodelx/geodelx.c
index 9e2d4567a3..fdc0f03fdb 100644
--- a/northbridge/amd/geodelx/geodelx.c
+++ b/northbridge/amd/geodelx/geodelx.c
@@ -19,15 +19,11 @@
  */
 
 #include <types.h>
-#include <lib.h>
 #include <console.h>
-#include <post_code.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <string.h>
 #include <msr.h>
-#include <io.h>
 #include <amd_geodelx.h>
 
 /* Here is programming for the various MSRs. */
diff --git a/northbridge/amd/geodelx/geodelxinit.c b/northbridge/amd/geodelx/geodelxinit.c
index ae20a1d12f..94ef666f22 100644
--- a/northbridge/amd/geodelx/geodelxinit.c
+++ b/northbridge/amd/geodelx/geodelxinit.c
@@ -19,14 +19,9 @@
  */
 
 #include <types.h>
-#include <lib.h>
 #include <console.h>
 #include <post_code.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <string.h>
 #include <msr.h>
-#include <io.h>
 #include <cpu.h>
 #include <amd_geodelx.h>
 
diff --git a/northbridge/amd/geodelx/raminit.c b/northbridge/amd/geodelx/raminit.c
index 4d250f510b..64fd431676 100644
--- a/northbridge/amd/geodelx/raminit.c
+++ b/northbridge/amd/geodelx/raminit.c
@@ -22,9 +22,6 @@
 #include <lib.h>
 #include <console.h>
 #include <post_code.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <string.h>
 #include <msr.h>
 #include <spd.h>
 #include <io.h>
diff --git a/northbridge/amd/geodelx/raminit.h b/northbridge/amd/geodelx/raminit.h
index 80c166e4bb..a5c750b344 100644
--- a/northbridge/amd/geodelx/raminit.h
+++ b/northbridge/amd/geodelx/raminit.h
@@ -18,6 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef NORTHBRIDGE_AMD_GEODELX_RAMINIT_H
+#define NORTHBRIDGE_AMD_GEODELX_RAMINIT_H
+
+#include <types.h>
+
 void sdram_set_registers(void);
 void sdram_set_spd_registers(u8 dimm0, u8 dimm1);
 void sdram_enable(u8 dimm0, u8 dimm1);
+
+#endif /* NORTHBRIDGE_AMD_GEODELX_RAMINIT_H */
diff --git a/southbridge/amd/cs5536/cs5536.c b/southbridge/amd/cs5536/cs5536.c
index 963754fb6c..31c2ead64b 100644
--- a/southbridge/amd/cs5536/cs5536.c
+++ b/southbridge/amd/cs5536/cs5536.c
@@ -21,13 +21,10 @@
 #include <lib.h>
 #include <console.h>
 #include <post_code.h>
-#include <device/device.h>
 #include <device/pci.h>
-#include <string.h>
 #include <msr.h>
-#include <io.h>
 #include <amd_geodelx.h>
-#include <cpu.h>
+#include <cpu.h>		// TODO: Move rtc_init() etc. to legacy.h
 #include <device/pci_ids.h>
 #include <statictree.h>
 #include "cs5536.h"
diff --git a/southbridge/amd/cs5536/smbus_initram.c b/southbridge/amd/cs5536/smbus_initram.c
index 9b6aeda48d..9912c91057 100644
--- a/southbridge/amd/cs5536/smbus_initram.c
+++ b/southbridge/amd/cs5536/smbus_initram.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <types.h>
 #include <console.h>
 #include <io.h>
 #include "cs5536.h"
diff --git a/southbridge/amd/cs5536/stage1.c b/southbridge/amd/cs5536/stage1.c
index 78a26a7500..8bb9bae937 100644
--- a/southbridge/amd/cs5536/stage1.c
+++ b/southbridge/amd/cs5536/stage1.c
@@ -17,8 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console.h>
-#include <io.h>
+#include <types.h>
 #include <msr.h>
 #include <amd_geodelx.h>
 #include "cs5536.h"