File tree Expand file tree Collapse file tree 3 files changed +19
-3
lines changed Expand file tree Collapse file tree 3 files changed +19
-3
lines changed Original file line number Diff line number Diff line change @@ -557,7 +557,7 @@ $(LINUX_MODULES_INSTALL_PATH)/lib/modules:
557
557
run : $(RUN_DEPS ) | $(SHARED_DIR ) $(LINUX_MODULES_INSTALL_PATH ) /lib/modules
558
558
@echo " $( GREEN) Running QEMU, press 'ctrl-a x' to quit $( NC) "
559
559
ifeq ($(GDB ) ,1)
560
- @echo "$(ARCH) $(ACK)" > $(OUT_DIR)/.gdb
560
+ @echo "$(ARCH) $(ACK) $(TRUSTY) $(TRUSTY_TARGET) " > $(OUT_DIR)/.gdb
561
561
@echo "$(GREEN)Waiting for GDB, attach with \`scripts/gdb.sh\` $(NC)"
562
562
563
563
ifdef TERMINAL_CMD
Original file line number Diff line number Diff line change @@ -18,16 +18,23 @@ alternatively run the following command:
18
18
EOF
19
19
fi
20
20
21
- IFS=" " read -r ARCH ACK < $GDB_FILE
21
+ IFS=" " read -r ARCH ACK TRUSTY TRUSTY_TARGET < $GDB_FILE
22
22
23
23
if [[ " $ACK " -eq 1 ]]; then
24
24
LINUX_OUT=$OUT_DIR /ack/common/$ARCH
25
25
else
26
26
LINUX_OUT=$OUT_DIR /linux/$ARCH
27
27
fi
28
28
29
+ TRUSTY_OUT=$OUT_DIR /trusty/build-$TRUSTY_TARGET
30
+
29
31
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 "
31
38
32
39
if [[ $ARCH == " x86_64" ]]; then
33
40
GDB=gdb
Original file line number Diff line number Diff line change 1
1
file ##LINUX_OUT##/vmlinux
2
2
source ##LINUX_OUT##/vmlinux-gdb.py
3
+
3
4
target remote :1234
5
+
4
6
# 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
You can’t perform that action at this time.
0 commit comments