Merge branch 'master' of git@github.com:jwise/netwatch

[netwatch.git] / netwatch / Makefile

diff --git a/netwatch/Makefile b/netwatch/Makefile
index 1d7621a9540545026475d80285ee5b99dc4b2836..9609e0382c7047be4706420e602390d8d5007e53 100644 (file)
--- a/netwatch/Makefile
+++ b/netwatch/Makefile
@@ -56,6 +56,9 @@ OBJS =        ../ich2/smi.o \
        ../lib/console.o \
        ../lib/serial.o \
        ../lib/crc32.o \
        ../lib/console.o \
        ../lib/serial.o \
        ../lib/crc32.o \

+       ../lib/demap.o \
+       ../lib/state.o \
+       ../lib/cpuid.o \

        keyboard.o \
        packet.o \
        $(LWIP_OBJS) \
        keyboard.o \
        packet.o \
        $(LWIP_OBJS) \


@@ -68,8 +71,8 @@ OBJS =        ../ich2/smi.o \
 
 all: aseg.elf
 
 
 all: aseg.elf
 

-aseg.elf: aseg.lds $(STUBOBJS) $(OBJS)
-       ld -o aseg.elf -T aseg.lds $(STUBOBJS) $(OBJS)
+aseg.elf: netwatch-large.lds $(STUBOBJS) $(OBJS)
+       ld -o aseg.elf -T netwatch-large.lds $(STUBOBJS) $(OBJS)

 
 clean:
        rm -f $(OBJS) aseg.elf entry.bin entry.o
 
 clean:
        rm -f $(OBJS) aseg.elf entry.bin entry.o