git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
physical page list mapping
[lunaix-os.git]
/
lunaix-os
/
live_debug.sh
diff --git
a/lunaix-os/live_debug.sh
b/lunaix-os/live_debug.sh
index 6462f5d6581ae81e0dc25540f8d1f384bdf75c8e..d70c54d39f39ad01856747d8437a5693f8175f04 100755
(executable)
--- a/
lunaix-os/live_debug.sh
+++ b/
lunaix-os/live_debug.sh
@@
-4,14
+4,20
@@
hmp_port=45454
gdb_port=1234
default_cmd="console=/dev/ttyS0"
gdb_port=1234
default_cmd="console=/dev/ttyS0"
-make
CMDLINE=${default_cmd} ARCH=${ARCH} MODE=${MODE:-debug} image
-j5 || exit -1
+make
ARCH=${ARCH} MODE=${MODE:-debug} all
-j5 || exit -1
./scripts/qemu.py \
scripts/qemus/qemu_x86_dev.json \
--qemu-dir "${QEMU_DIR}" \
./scripts/qemu.py \
scripts/qemus/qemu_x86_dev.json \
--qemu-dir "${QEMU_DIR}" \
- -v KIMG=build/lunaix.iso \
-v QMPORT=${hmp_port} \
-v GDB_PORT=${gdb_port} \
-v QMPORT=${hmp_port} \
-v GDB_PORT=${gdb_port} \
- -v ARCH=${ARCH} &
+ -v ROOTFS=lunaix_rootfs.ext2 \
+ -v ARCH=${ARCH} \
+ -v KBIN=build/bin/kernel.bin \
+ -v "KCMD=${default_cmd} rootfs=/dev/block/sda init=/bin/init" \
+ -- \
+ -nographic &
-QMPORT=${hmp_port} gdb build/bin/kernel.bin -ex "target remote localhost:${gdb_port}"
\ No newline at end of file
+QMPORT=${hmp_port} gdb-multiarch \
+ build/bin/kernel.bin \
+ -ex "target remote localhost:${gdb_port}"
\ No newline at end of file