Browse Source

Add .pdsk target (padded .dsk, suitable for qemu).

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
763a3eab8a
2 changed files with 9 additions and 3 deletions
  1. 2
    3
      contrib/bochs/README.qemu
  2. 7
    0
      src/arch/i386/Makefile

+ 2
- 3
contrib/bochs/README.qemu View File

54
 
54
 
55
 8.  Build Etherboot floppy disk images and pad to 1.44MB
55
 8.  Build Etherboot floppy disk images and pad to 1.44MB
56
       pushd ../../src
56
       pushd ../../src
57
-      make bin/rtl8139.dsk
58
-      ./util/dskpad.pl bin/rtl8139.dsk
57
+      make bin/rtl8139.pdsk
59
       popd
58
       popd
60
 
59
 
61
 9.  Start qemu
60
 9.  Start qemu
62
       export SDL_VIDEO_X11_DGAMOUSE=0
61
       export SDL_VIDEO_X11_DGAMOUSE=0
63
       ./qemu/i386-softmmu/qemu -L qemu/pc-bios \
62
       ./qemu/i386-softmmu/qemu -L qemu/pc-bios \
64
 			       -net nic,model=rtl8139 -net tap,ifname=tap0 \
63
 			       -net nic,model=rtl8139 -net tap,ifname=tap0 \
65
-			       -boot a -fda ../../src/bin/rtl8139.dsk 
64
+			       -boot a -fda ../../src/bin/rtl8139.pdsk 
66
 
65
 
67
 You should see qemu start up, load up Etherboot and attempt to boot
66
 You should see qemu start up, load up Etherboot and attempt to boot
68
 from the network.
67
 from the network.

+ 7
- 0
src/arch/i386/Makefile View File

111
 	dd if=$< bs=512 conv=sync of=/dev/fd0
111
 	dd if=$< bs=512 conv=sync of=/dev/fd0
112
 	sync
112
 	sync
113
 
113
 
114
+# rule to create padded disk images
115
+NON_AUTO_MEDIA		+= pdsk
116
+%pdsk : %dsk
117
+	cp $< $@
118
+	$(PERL) ./util/dskpad.pl $@
119
+
114
 # rule to make a non-emulation ISO boot image
120
 # rule to make a non-emulation ISO boot image
115
 NON_AUTO_MEDIA		+= iso
121
 NON_AUTO_MEDIA		+= iso
116
 %iso:	%lilo util/geniso
122
 %iso:	%lilo util/geniso
125
 $(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
131
 $(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
126
 	$(OBJCOPY) -O binary $< $@
132
 	$(OBJCOPY) -O binary $< $@
127
 
133
 
134
+NON_AUTO_MEDIA		+= usb
128
 %usb: $(BIN)/usbdisk.bin %hd
135
 %usb: $(BIN)/usbdisk.bin %hd
129
 	cat $^ > $@
136
 	cat $^ > $@
130
 
137
 

Loading…
Cancel
Save