From: Joshua Wise <joshua@escape.wv.cc.cmu.edu>
Date: Sat, 10 Oct 2009 09:04:02 +0000 (-0400)
Subject: Move the Multiboot code around to have more sane filenames.
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/c7eda62d83dd463895a3b096f8c32502077e7bcd?ds=sidebyside;hp=114f6096b4d2c31314a7d4030f67aaeb1f0f8787

Move the Multiboot code around to have more sane filenames.
---

diff --git a/grubload/Makefile b/grubload/Makefile
index 49e0e4e..8b89e59 100644
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,13 +1,13 @@
 -include ../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 ../ich2/smram-ich2.o ../ich2/smi.o 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
 
-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 +16,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
diff --git a/grubload/multiboot_c.c b/grubload/main.c
similarity index 99%
rename from grubload/multiboot_c.c
rename to grubload/main.c
index 9806ca4..904b1e3 100644
--- a/grubload/multiboot_c.c
+++ b/grubload/main.c
@@ -1,4 +1,4 @@
-/* multiboot_c.c
+/* main.c
  * Main program for starting SMM code
  * NetWatch multiboot loader
  *
diff --git a/grubload/multiboot_asm.S b/grubload/mbentry.S
similarity index 97%
rename from grubload/multiboot_asm.S
rename to grubload/mbentry.S
index c7fd794..73cca00 100644
--- a/grubload/multiboot_asm.S
+++ b/grubload/mbentry.S
@@ -1,4 +1,4 @@
-/* multiboot_asm.S
+/* mbentry.S
  * Multiboot header
  * NetWatch multiboot loader
  *