[scripts] trace32: make switching between 7k and 8k easier.

Also turn off pabort/dabort.
diff --git a/scripts/lk.cmm b/scripts/lk.cmm
index 9067d32..5dc1cfd 100644
--- a/scripts/lk.cmm
+++ b/scripts/lk.cmm
@@ -3,11 +3,21 @@
 global &KERNEL_ELF
 
 &KERNEL_SRC="../"
-&KERNEL_ELF="../build-aboot-surf8k/lk"
 
 sys.down
 
-do config_scorpion.cmm
+global &SURF
+
+if ("&SURF"=="7k")
+(
+  &KERNEL_ELF="../build-aboot-surf7k/lk"
+  do config_a11.cmm
+)
+else
+(
+  &KERNEL_ELF="../build-aboot-surf8k/lk"
+  do config_scorpion.cmm
+)
 
 sys.mode attach
 
@@ -23,8 +33,8 @@
 ;register.set r1 &MACHINE_ID
 ;register.set r2 &TAGS_ADDR
 
-;tronchip.set dabort off
-;tronchip.set pabort off
+tronchip.set dabort off
+tronchip.set pabort off
 
 term.reset
 term.size 70 100