summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-03-27 14:26:56 -0400
committerFreya Murphy <freya@freyacat.org>2025-03-27 14:26:56 -0400
commit8683b472a6a7513c4dc29517f3145384fed372f0 (patch)
treecd136f35d4db2e8b66d910fa4869859ba6655865 /Makefile
parentpull changes (diff)
downloadcomus-8683b472a6a7513c4dc29517f3145384fed372f0.tar.gz
comus-8683b472a6a7513c4dc29517f3145384fed372f0.tar.bz2
comus-8683b472a6a7513c4dc29517f3145384fed372f0.zip
move user to 0x30000, update kernel.ld
Diffstat (limited to '')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1283f3a..437b355 100644
--- a/Makefile
+++ b/Makefile
@@ -46,5 +46,5 @@ bin/user.img: build
bin/disk.img: build bin/boot.bin bin/user.img
cd bin && \
./BuildImage -d usb -o disk.img -b boot.bin \
- kernel 0x10000 user.img 0x40000
+ kernel 0x10000 user.img 0x30000