diff options
| -rw-r--r-- | contrib/bochs/README.qemu | 4 | ||||
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/Makefile.housekeeping | 1 | ||||
| -rw-r--r-- | src/arch/i386/Makefile | 7 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.pcbios | 6 | ||||
| -rwxr-xr-x | src/util/dskpad.pl | 12 | ||||
| -rwxr-xr-x | src/util/padimg.pl | 44 |
7 files changed, 54 insertions, 21 deletions
diff --git a/contrib/bochs/README.qemu b/contrib/bochs/README.qemu index 18575103..0c388973 100644 --- a/contrib/bochs/README.qemu +++ b/contrib/bochs/README.qemu @@ -47,13 +47,13 @@ To get qemu running is fairly simple: 8. Build gPXE floppy disk images and pad to 1.44MB pushd ../../src - make bin/rtl8139.pdsk + make bin/rtl8139.dsk popd 9. Start qemu ./qemu/i386-softmmu/qemu -L qemu/pc-bios \ -net nic,model=rtl8139 -net tap,ifname=tap0 \ - -boot a -fda ../../src/bin/rtl8139.pdsk + -boot a -fda ../../src/bin/rtl8139.dsk You should see qemu start up, load up gPXE and attempt to boot from the network. diff --git a/src/Makefile b/src/Makefile index 099762ce..4e4fd8b5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -35,6 +35,7 @@ PARSEROM := $(PERL) ./util/parserom.pl MAKEROM := $(PERL) ./util/makerom.pl SYMCHECK := $(PERL) ./util/symcheck.pl SORTOBJDUMP := $(PERL) ./util/sortobjdump.pl +PADIMG := $(PERL) ./util/padimg.pl NRV2B := ./util/nrv2b ZBIN := ./util/zbin ELF2EFI32 := ./util/elf2efi32 diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index 8edb0127..38bd058c 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -724,6 +724,7 @@ define media_template @$(ECHO_E) '$$(BIN)/%.$(1) : $$(BIN)/%.$(1).zbin' \ '\n\t$$(QM)$(ECHO) " [FINISH] $$@"' \ '\n\t$$(Q)$$(CP) $$< $$@' \ + '\n\t$$(Q)$$(PAD_$(1))' \ '\n\t$$(Q)$$(FINALISE_$(1))' \ > $(2) diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index ca8ba1b2..9cf2bd69 100644 --- a/src/arch/i386/Makefile +++ b/src/arch/i386/Makefile @@ -114,13 +114,6 @@ NON_AUTO_MEDIA += fd0 $(Q)dd if=$< bs=512 conv=sync of=/dev/fd0 $(Q)sync -# rule to create padded disk images -NON_AUTO_MEDIA += pdsk -%pdsk : %dsk - $(QM)$(ECHO) " [DSKPAD] $@" - $(Q)cp $< $@ - $(Q)$(PERL) ./util/dskpad.pl $@ - # Add NON_AUTO_MEDIA to the media list, so that they show up in the # output of "make" # diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios index 64b3dac2..7aa0afd8 100644 --- a/src/arch/i386/Makefile.pcbios +++ b/src/arch/i386/Makefile.pcbios @@ -27,6 +27,12 @@ MEDIA += raw MEDIA += com MEDIA += exe +# Padding rules +# +PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@ +PAD_dsk = $(PADIMG) --blksize=512 $@ +PAD_hd = $(PADIMG) --blksize=512 $@ + # rule to make a non-emulation ISO boot image NON_AUTO_MEDIA += iso %iso: %lkrn util/geniso diff --git a/src/util/dskpad.pl b/src/util/dskpad.pl deleted file mode 100755 index 3ae325eb..00000000 --- a/src/util/dskpad.pl +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/perl -w - -use strict; -use warnings; - -use constant FLOPPYSIZE => 1440 * 1024; - -while ( my $filename = shift ) { - die "$filename is not a file\n" unless -f $filename; - die "$filename is too large\n" unless ( -s $filename <= FLOPPYSIZE ); - truncate $filename, FLOPPYSIZE or die "Could not truncate: $!\n"; -} diff --git a/src/util/padimg.pl b/src/util/padimg.pl new file mode 100755 index 00000000..f3dcbbc3 --- /dev/null +++ b/src/util/padimg.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl -w + +use strict; +use warnings; +use Getopt::Long; +use Fcntl; + +my $verbosity = 0; +my $blksize = 512; +my $byte = 0; + +my $opts = { + 'verbose|v+' => sub { $verbosity++; }, + 'quiet|q+' => sub { $verbosity--; }, + 'blksize|s=o' => sub { $blksize = $_[1]; }, + 'byte|b=o' => sub { $byte = $_[1]; }, +}; + +Getopt::Long::Configure ( 'bundling', 'auto_abbrev' ); +GetOptions ( { map { /^(\w+)/; $1 => $opts->{$_} } keys %$opts }, keys %$opts ) + or die "Could not parse command-line options\n"; + +while ( my $filename = shift ) { + die "$filename is not a file\n" unless -f $filename; + my $oldsize = -s $filename; + my $newsize = ( ( $oldsize + $blksize - 1 ) & ~( $blksize - 1 ) ); + my $padsize = ( $newsize - $oldsize ); + next unless $padsize; + if ( $verbosity >= 1 ) { + printf "Padding %s from %d to %d bytes with %d x 0x%02x\n", + $filename, $oldsize, $newsize, $padsize, $byte; + } + if ( $byte ) { + sysopen ( my $fh, $filename, ( O_WRONLY | O_APPEND ) ) + or die "Could not open $filename for appending: $!\n"; + syswrite $fh, ( chr ( $byte ) x $padsize ) + or die "Could not append to $filename: $!\n"; + close ( $fh ); + } else { + truncate $filename, $newsize + or die "Could not resize $filename: $!\n"; + } + die "Failed to pad $filename\n" unless -s $filename == $newsize; +} |