Skip to content

Commit 4b8ac4b

Browse files
committed
Add Trusty GDB support
1 parent 20ab084 commit 4b8ac4b

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ $(LINUX_MODULES_INSTALL_PATH)/lib/modules:
557557
run: $(RUN_DEPS) | $(SHARED_DIR) $(LINUX_MODULES_INSTALL_PATH)/lib/modules
558558
@echo "$(GREEN)Running QEMU, press 'ctrl-a x' to quit $(NC)"
559559
ifeq ($(GDB),1)
560-
@echo "$(ARCH) $(ACK)" > $(OUT_DIR)/.gdb
560+
@echo "$(ARCH) $(ACK) $(TRUSTY) $(TRUSTY_TARGET)" > $(OUT_DIR)/.gdb
561561
@echo "$(GREEN)Waiting for GDB, attach with \`scripts/gdb.sh\` $(NC)"
562562

563563
ifdef TERMINAL_CMD

scripts/gdb.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,23 @@ alternatively run the following command:
1818
EOF
1919
fi
2020

21-
IFS=" " read -r ARCH ACK < $GDB_FILE
21+
IFS=" " read -r ARCH ACK TRUSTY TRUSTY_TARGET < $GDB_FILE
2222

2323
if [[ "$ACK" -eq 1 ]]; then
2424
LINUX_OUT=$OUT_DIR/ack/common/$ARCH
2525
else
2626
LINUX_OUT=$OUT_DIR/linux/$ARCH
2727
fi
2828

29+
TRUSTY_OUT=$OUT_DIR/trusty/build-$TRUSTY_TARGET
30+
2931
OUTPUT=$(mktemp)
30-
sed "s|##LINUX_OUT##|${LINUX_OUT}|g" "$GDBINIT" > "$OUTPUT"
32+
cp "$GDBINIT" "$OUTPUT"
33+
echo "Using gdbscript in $OUTPUT"
34+
35+
sed -i "s|##LINUX_OUT##|${LINUX_OUT}|g" "$OUTPUT"
36+
sed -i "s|##TRUSTY_OUT##|${TRUSTY_OUT}|g" "$OUTPUT"
37+
sed -i "s|##TRUSTY##|${TRUSTY}|g" "$OUTPUT"
3138

3239
if [[ $ARCH == "x86_64" ]]; then
3340
GDB=gdb

scripts/gdbinit.gdb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
file ##LINUX_OUT##/vmlinux
22
source ##LINUX_OUT##/vmlinux-gdb.py
3+
34
target remote :1234
5+
46
# add-symbol-file ##LINUX_OUT##/modules_install/lib/modules/5.10.107/extra/my_module.ko -s .text 0xffffffc0091b0800
7+
8+
if ##TRUSTY## == 1
9+
add-symbol-file ##TRUSTY_OUT##/atf/qemu/debug/bl1/bl1.elf 0x0
10+
add-symbol-file ##TRUSTY_OUT##/atf/qemu/debug/bl2/bl2.elf 0x0
11+
add-symbol-file ##TRUSTY_OUT##/atf/qemu/debug/bl31/bl31.elf 0xe0a0000
12+
add-symbol-file ##TRUSTY_OUT##/lk.elf 0xe200000
13+
endif

0 commit comments

Comments
 (0)