At least pretend to split more ICH2 bits out into a config.mk. A real build system...

diff --git a/grubload/Makefile b/grubload/Makefile
index 8b89e597686bdd9356649ecf4815804bb80ae9a7..7e9a93e099b8ba20d9afeb4925a38c2956f6b2fa 100644 (file)
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,6 +1,7 @@
 -include ../config.mk
 -include ../config.mk

+-include ../ich2/config.mk

 
 

-OBJS=main.o mbentry.o realmode.o loader.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o output.o ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o
+OBJS=main.o mbentry.o realmode.o loader.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o $(CHIP_OBJS) output.o ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o

 CC=$(CROSS)gcc
 CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99
 
 CC=$(CROSS)gcc
 CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99
 

diff --git a/ich2/config.mk b/ich2/config.mk
new file mode 100644 (file)
index 0000000..5164324
--- /dev/null
+++ b/ich2/config.mk
@@ -0,0 +1,4 @@
+CFLAGS += -DNETWATCH_ICH2 -I../ich2
+CHIP_OBJS += ../ich2/ich2-timer.o \
+             ../ich2/smi.o \
+             ../ich2/smram-ich2.o

diff --git a/ich2/smram-hardware.h b/ich2/smram-hardware.h
new file mode 120000 (symlink)
index 0000000..ef1740f
--- /dev/null
+++ b/ich2/smram-hardware.h
@@ -0,0 +1 @@
+smram-ich2.h
\ No newline at end of file

diff --git a/include/smram.h b/include/smram.h
index 5509d0913c96b07de004c281335c1149c2a73448..8e04b1e38ac5764ad8fb7476f42e68bba8af67d3 100644 (file)
--- a/include/smram.h
+++ b/include/smram.h
@@ -1,7 +1,7 @@
 #ifndef __SMRAM_H
 #define __SMRAM_H
 
 #ifndef __SMRAM_H
 #define __SMRAM_H
 

-#include "../ich2/smram-ich2.h"
+#include "smram-hardware.h"

 
 extern int smram_locked();
 extern smram_state_t smram_save_state();
 
 extern int smram_locked();
 extern smram_state_t smram_save_state();

diff --git a/netwatch/Makefile b/netwatch/Makefile
index eb3da87b296b5897a32026c1832377fa2babe008..11a837bb0e7adf26c20f7c6aa800d5c27fbaf1d4 100644 (file)
--- a/netwatch/Makefile
+++ b/netwatch/Makefile
@@ -1,11 +1,12 @@
 -include ../config.mk
 -include ../config.mk

+-include ../ich2/config.mk

 
 CC=$(CROSS)gcc
 
 CC=$(CROSS)gcc

-CFLAGS=-I../include -I../include/raw \
-       -I../lwip/src/include -I../lwip/src/include/ipv4 \
-       -nostdlib -nostdinc -fno-builtin -D__RAW__ \
-       -Wall -Werror -std=gnu99 -Wstrict-aliasing=2 \
-       -O1 -fno-merge-constants -fno-strict-aliasing
+CFLAGS+=-I../include -I../include/raw \
+        -I../lwip/src/include -I../lwip/src/include/ipv4 \
+        -nostdlib -nostdinc -fno-builtin -D__RAW__ \
+        -Wall -Werror -std=gnu99 -Wstrict-aliasing=2 \
+        -O1 -fno-merge-constants -fno-strict-aliasing

 
 STUBOBJS=entry.o pagingstub-asm.o pagingstub.o
 
 
 STUBOBJS=entry.o pagingstub-asm.o pagingstub.o
 


@@ -36,9 +37,7 @@ LWIP_OBJS = \
        ../lwip/src/netif/ethernetif.o
 
 
        ../lwip/src/netif/ethernetif.o
 
 

-OBJS = ../ich2/smi.o \
-       ../ich2/smram-ich2.o \
-       ../ich2/ich2-timer.o \
+OBJS = $(CHIP_OBJS) \

        ../pci/pci.o \
        ../pci/pci-raw.o \
        ../pci/pci-bother.o \
        ../pci/pci.o \
        ../pci/pci-raw.o \
        ../pci/pci-bother.o \