Fix gdb scripts for Trusty debugging

Author: abcSup

Diff for: scripts/gdb.sh

@@ -20,14 +20,16 @@ fi
 
 IFS=" " read -r ARCH ACK TRUSTY TRUSTY_TARGET < $GDB_FILE
 
+TRUSTY_OUT=$OUT_DIR/trusty/build-$TRUSTY_TARGET
+
 if [[ "$ACK" -eq 1 ]]; then
     LINUX_OUT=$OUT_DIR/ack/common/$ARCH
+elif [[ "$TRUSTY" -eq 1 ]] then
+    LINUX_OUT=$TRUSTY_OUT/linux-build
 else
     LINUX_OUT=$OUT_DIR/linux/$ARCH
 fi
 
-TRUSTY_OUT=$OUT_DIR/trusty/build-$TRUSTY_TARGET
-
 OUTPUT=$(mktemp)
 cp "$GDBINIT" "$OUTPUT"
 echo "Using gdbscript in $OUTPUT"

Diff for: scripts/gdbinit.gdb

@@ -10,4 +10,4 @@ if ##TRUSTY## == 1
    add-symbol-file ##TRUSTY_OUT##/atf/qemu/debug/bl2/bl2.elf 0x0
    add-symbol-file ##TRUSTY_OUT##/atf/qemu/debug/bl31/bl31.elf 0xe0a0000
    add-symbol-file ##TRUSTY_OUT##/lk.elf 0xe200000
-endif
+end