Move the Multiboot code around to have more sane filenames.

diff --git a/grubload/Makefile b/grubload/Makefile
index 49e0e4e01d961f276a89682842dfbebe5b2de12f..8b89e597686bdd9356649ecf4815804bb80ae9a7 100644 (file)
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,13 +1,13 @@
 -include ../config.mk
 
 -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
 
 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
 
 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:
        $(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 9806ca41e3c23c233b4bfde6269c29effaf4f1b5..904b1e3f7307159d1f918df81a92bd8a3cd665a8 100644 (file)
--- 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
  *
  * 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 c7fd7942d97eab786ddb8b05e8c2828e6412d0b7..73cca00362456dff72f8262e48feee3dadeb072e 100644 (file)
--- a/grubload/multiboot_asm.S
+++ b/grubload/mbentry.S
@@ -1,4 +1,4 @@
-/* multiboot_asm.S
+/* mbentry.S

  * Multiboot header
  * NetWatch multiboot loader
  *
  * Multiboot header
  * NetWatch multiboot loader
  *