summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2023-12-02 18:54:18 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2023-12-02 18:54:18 +0100
commit4da4c5449c559d8ddd8fc5fb69b29186753c67ed (patch)
treef97c06ea333b73b15aa8d2f7a82ab4a6e5d37c37
parent795181d95ef5a709af546353d03e3bdc65eb4683 (diff)
downloadi486tcc-linux-4da4c5449c559d8ddd8fc5fb69b29186753c67ed.tar.gz
i486tcc-linux-4da4c5449c559d8ddd8fc5fb69b29186753c67ed.tar.bz2
new kernel, more memory, clashes with ramdisk when loaded via floppy, so increased to 24MB for now
-rw-r--r--patches/uflbbl-boot-options.patch6
-rwxr-xr-xscripts/run_qemu.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/uflbbl-boot-options.patch b/patches/uflbbl-boot-options.patch
index 875814d..6149fee 100644
--- a/patches/uflbbl-boot-options.patch
+++ b/patches/uflbbl-boot-options.patch
@@ -6,12 +6,12 @@ diff -rauN uflbbl/src/boot.asm uflbbl-boot-options/src/boot.asm
; qemu initrd start location 7fab000, 133869568 (this is 128MB) too high for us,
; kernel gives us alignment hints and hints where to load initrd to?
-; let's use 8MB, TODO: does the kernel release the initial ramdisk? I think so. is
-+; let's use 6MB, TODO: does the kernel release the initial ramdisk? I think so. is
++; let's use 8MB, TODO: does the kernel release the initial ramdisk? I think so. is
; it relocating it's structures? or do we get fragmented heap and stuff?
- a32 mov [READ_DESTINATION_PTR], dword 0x00800000
- a32 mov [INITRD_ADDRESS], dword 0x00800000
-+ a32 mov [READ_DESTINATION_PTR], dword 0x00580000
-+ a32 mov [INITRD_ADDRESS], dword 0x00580000
++ a32 mov [READ_DESTINATION_PTR], dword 0x00800000
++ a32 mov [INITRD_ADDRESS], dword 0x00800000
a32 mov eax, [READ_DATA_SIZE]
a32 mov [INITRD_SIZE], eax
mov al, '!'
diff --git a/scripts/run_qemu.sh b/scripts/run_qemu.sh
index 87a9740..ad5fe1b 100755
--- a/scripts/run_qemu.sh
+++ b/scripts/run_qemu.sh
@@ -2,7 +2,7 @@
qemu-nbd -f raw root.img -x ROOT &
sleep 2 && \
-qemu-system-i386 -cpu 486 -m 18M -machine isapc \
+qemu-system-i386 -cpu 486 -m 24M -machine isapc \
-drive "file=floppy00,if=floppy,format=raw" \
-netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16,hostfwd=tcp::2222-:22,hostfwd=tcp::6001-:6000 \
-vga std \