Slightly permute the USB_LEGKEY stuff.

[netwatch.git] / grubload / Makefile

diff --git a/grubload/Makefile b/grubload/Makefile
index 49e0e4e01d961f276a89682842dfbebe5b2de12f..8aae1ddf4187337c1814533a4f469b5afd46d33b 100644 (file)
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,13 +1,14 @@
 -include ../config.mk
+-include ../hardware/ich2/config.mk
 
-OBJS=multiboot_c.o multiboot_asm.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
+CFLAGS+=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99
 
-all: multiboot
+all: smmload
 
-multiboot: $(OBJS)
-       $(CROSS)ld -o multiboot $(OBJS) -Ttext=0x100000
+smmload: $(OBJS)
+       $(CROSS)ld -o smmload $(OBJS) -Ttext=0x100000
 
 realmode.bin: realmode.asm
        nasm -o realmode.bin realmode.asm
@@ -16,4 +17,4 @@ realmode.o: realmode.bin
        $(CROSS)objcopy -I binary -B i386 -O elf32-i386 realmode.bin realmode.o
 
 clean:
-       rm -f $(OBJS) realmode.bin multiboot
+       rm -f $(OBJS) realmode.bin smmload