Merge "jtag: make debug arch defines local to jtag.c"