vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make default image use MBR partition table

Browse source
This commit is contained in:
Jeremy Soller 2020-11-22 21:08:43 -07:00
parent f30e25f58e
commit 1b7fe5e233
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mk/disk.mk
View file

@ -3,9 +3,6 @@ build/bootloader: bootloader/$(ARCH)/**
nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/** build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/**
nasm -f bin -o $@ -D ARCH_$(ARCH) -D FILESYSTEM=$< -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
build/harddrive-mbr.bin: build/filesystem.bin bootloader/$(ARCH)/**
nasm -f bin -o build/bootsector.bin -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm nasm -f bin -o build/bootsector.bin -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
dd if=/dev/zero of=$@.partial bs=1M count=$$(expr $$(du -m $< | cut -f1) + 2) dd if=/dev/zero of=$@.partial bs=1M count=$$(expr $$(du -m $< | cut -f1) + 2)
parted -s -a minimal $@.partial mklabel msdos parted -s -a minimal $@.partial mklabel msdos

12
mk/qemu.mk
View file

@ -45,7 +45,7 @@ ifeq ($(UNAME),Linux)
ifneq ($(kvm),no) ifneq ($(kvm),no)
QEMUFLAGS+=-enable-kvm -cpu host QEMUFLAGS+=-enable-kvm -cpu host
else else
QEMUFLAGS+=-cpu Skylake-Client QEMUFLAGS+=-cpu max
endif endif
endif endif
#,int,pcall #,int,pcall
@ -69,16 +69,6 @@ qemu_no_build: build/extra.bin
-drive file=build/harddrive.bin,format=raw \ -drive file=build/harddrive.bin,format=raw \
-drive file=build/extra.bin,format=raw -drive file=build/extra.bin,format=raw
qemu_mbr: build/harddrive-mbr.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive-mbr.bin,format=raw \
-drive file=build/extra.bin,format=raw
qemu_mbr_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive-mbr.bin,format=raw \
-drive file=build/extra.bin,format=raw
qemu_efi: build/harddrive-efi.bin build/extra.bin qemu_efi: build/harddrive-efi.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios $(QEMU_EFI) \ -bios $(QEMU_EFI) \