See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Remove some include files which are not required (and add some which are).
Signed-off-by: Uwe Hermann <[EMAIL PROTECTED]>
Index: southbridge/amd/cs5536/stage1.c
===================================================================
--- southbridge/amd/cs5536/stage1.c (Revision 446)
+++ southbridge/amd/cs5536/stage1.c (Arbeitskopie)
@@ -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"
Index: southbridge/amd/cs5536/cs5536.c
===================================================================
--- southbridge/amd/cs5536/cs5536.c (Revision 446)
+++ southbridge/amd/cs5536/cs5536.c (Arbeitskopie)
@@ -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"
Index: southbridge/amd/cs5536/smbus_initram.c
===================================================================
--- southbridge/amd/cs5536/smbus_initram.c (Revision 446)
+++ southbridge/amd/cs5536/smbus_initram.c (Arbeitskopie)
@@ -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"
Index: include/arch/x86/amd_geodelx.h
===================================================================
--- include/arch/x86/amd_geodelx.h (Revision 446)
+++ include/arch/x86/amd_geodelx.h (Arbeitskopie)
@@ -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
Index: northbridge/amd/geodelx/raminit.c
===================================================================
--- northbridge/amd/geodelx/raminit.c (Revision 446)
+++ northbridge/amd/geodelx/raminit.c (Arbeitskopie)
@@ -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>
Index: northbridge/amd/geodelx/geodelx.c
===================================================================
--- northbridge/amd/geodelx/geodelx.c (Revision 446)
+++ northbridge/amd/geodelx/geodelx.c (Arbeitskopie)
@@ -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. */
Index: northbridge/amd/geodelx/raminit.h
===================================================================
--- northbridge/amd/geodelx/raminit.h (Revision 446)
+++ northbridge/amd/geodelx/raminit.h (Arbeitskopie)
@@ -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 */
Index: northbridge/amd/geodelx/geodelxinit.c
===================================================================
--- northbridge/amd/geodelx/geodelxinit.c (Revision 446)
+++ northbridge/amd/geodelx/geodelxinit.c (Arbeitskopie)
@@ -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>
Index: arch/x86/geodelx/stage1.c
===================================================================
--- arch/x86/geodelx/stage1.c (Revision 446)
+++ arch/x86/geodelx/stage1.c (Arbeitskopie)
@@ -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;
Index: arch/x86/geodelx/cpu.c
===================================================================
--- arch/x86/geodelx/cpu.c (Revision 446)
+++ arch/x86/geodelx/cpu.c (Arbeitskopie)
@@ -29,7 +29,6 @@
*/
#include <console.h>
-#include <string.h>
#include <device/device.h>
#include <lib.h>
#include <io.h>
@@ -103,5 +102,6 @@
/* TODO: This is incorrect, these are _not_ PCI IDs! */
.u = {.pci = {.vendor = X86_VENDOR_AMD,.device = 0x05A2}}},
.ops = &geodelx_cpuops},
+
{.ops = 0},
};
Index: arch/x86/geodelx/geodelx.c
===================================================================
--- arch/x86/geodelx/geodelx.c (Revision 446)
+++ arch/x86/geodelx/geodelx.c (Arbeitskopie)
@@ -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>
signature.asc
Description: Digital signature
-- linuxbios mailing list [email protected] http://www.linuxbios.org/mailman/listinfo/linuxbios
