5.4.1 updates, hd booting

diff --git a/src/Makefile.main b/src/Makefile.main
index b8d57d1..8f017e7 100644 (file)
--- a/src/Makefile.main
+++ b/src/Makefile.main
@@ -230,7 +230,7 @@ noargs:     $(BIN)/toolcheck
        @echo
        @echo '    $(MAKE) bin/<rom-name>.<output-format> '
        @echo
        @echo
        @echo '    $(MAKE) bin/<rom-name>.<output-format> '
        @echo

-       @echo 'where <output-format> is one of {zdsk, zrom, iso, liso, zlilo, zpxe, elf, com}'
+       @echo 'where <output-format> is one of {zdsk, hd, zhd, zrom, iso, liso, zlilo, zpxe, elf, com}'

        @echo
        @echo 'or: '
        @echo
        @echo
        @echo 'or: '
        @echo

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index cded46c..d358cfc 100644 (file)
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -18,6 +18,7 @@ START=        $(BIN)/start32.o $(BIN)/linuxbios.o \
        $(BIN)/realmode.o $(BIN)/realmode_asm.o \
        $(BIN)/callbacks.o $(BIN)/pxe_callbacks.o
 
        $(BIN)/realmode.o $(BIN)/realmode_asm.o \
        $(BIN)/callbacks.o $(BIN)/pxe_callbacks.o
 

+SRCS+= arch/i386/prefix/hdprefix.S

 SRCS+= arch/i386/prefix/floppyprefix.S
 SRCS+= arch/i386/prefix/unhuf.S
 SRCS+= arch/i386/prefix/unnrv2b.S
 SRCS+= arch/i386/prefix/floppyprefix.S
 SRCS+= arch/i386/prefix/unhuf.S
 SRCS+= arch/i386/prefix/unnrv2b.S


@@ -72,6 +73,9 @@ TARGETENTRY=$($(TARGETTYPE)ENTRY)
 TARGETEXIT=$($(TARGETTYPE)EXIT)
 
 # Other real-mode entry loaders
 TARGETEXIT=$($(TARGETTYPE)EXIT)
 
 # Other real-mode entry loaders

+hdPREFIX=      $(BIN)/hdprefix.o
+hdENTRY=       $(BIN)/hdprefix.entry.o
+hdEXIT=                $(BIN)/hdprefix.exit.o

 dskPREFIX=     $(BIN)/floppyprefix.o
 dskENTRY=      $(BIN)/floppyprefix.entry.o
 dskEXIT=       $(BIN)/floppyprefix.exit.o
 dskPREFIX=     $(BIN)/floppyprefix.o
 dskENTRY=      $(BIN)/floppyprefix.entry.o
 dskEXIT=       $(BIN)/floppyprefix.exit.o


@@ -340,6 +344,19 @@ $(BIN)/%.dsk: $(BIN)/%.dsk.prf
 $(BIN)/%.zdsk: $(BIN)/%.dsk.zprf
        $(OBJCOPY) -O binary $< $@
 
 $(BIN)/%.zdsk: $(BIN)/%.dsk.zprf
        $(OBJCOPY) -O binary $< $@
 

+# rules to generate the .hd/.zhd harddisk images
+SUFFIXES +=    hd zhd
+
+$(BIN)/%.hd.rt: $(BIN)/%.rt.o $(hdENTRY) $(hdEXIT) $(LDSCRIPT) $(MAKEDEPS)
+       $(LD) $(LDFLAGS) -T $(LDSCRIPT) -o $@ $< $(hdEXIT)
+       @$(SIZE) $@ | $(CHECKSIZE)
+
+$(BIN)/%.hd: $(BIN)/%.hd.prf
+       $(OBJCOPY) -O binary $< $@
+
+$(BIN)/%.zhd: $(BIN)/%.hd.zprf
+       $(OBJCOPY) -O binary $< $@
+

 # rules to write the .dsk/.zdsk image onto a blank floppy
 SUFFIXES +=    fd0 zfd0
 %.fd0: %.dsk
 # rules to write the .dsk/.zdsk image onto a blank floppy
 SUFFIXES +=    fd0 zfd0
 %.fd0: %.dsk