diff --git a/src/mainboard/google/nyan/bct/Makefile.inc b/src/mainboard/google/nyan/bct/Makefile.inc
index 32490eba01..f5efad4e84 100644
--- a/src/mainboard/google/nyan/bct/Makefile.inc
+++ b/src/mainboard/google/nyan/bct/Makefile.inc
@@ -20,6 +20,7 @@
 bct-cfg-$(CONFIG_NYAN_BCT_CFG_EMMC) += emmc.cfg
 bct-cfg-$(CONFIG_NYAN_BCT_CFG_SPI) += spi.cfg
 bct-cfg-y += odmdata.cfg
+bct-cfg-y += jtag.cfg
 
 # Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate
 # the include files (sdram-*.inc) by running "./cfg2inc.sh sdram-*.cfg".
diff --git a/src/mainboard/google/nyan/bct/jtag.cfg b/src/mainboard/google/nyan/bct/jtag.cfg
new file mode 100644
index 0000000000..f43e143377
--- /dev/null
+++ b/src/mainboard/google/nyan/bct/jtag.cfg
@@ -0,0 +1,16 @@
+#
+# Set JtagCtrl to 1 to reenable Jtag
+#
+JtagCtrl = 0;
+#
+# Fill in chip unique id
+#
+# ChipUid can be found by running tegrarcm in tegra recovery mode
+# (also hooking up A-A USB cable) and looking for console output
+# on line starting with "Chip UID:"
+#
+# Command example:
+# $ sudo tegrarcm --bct=/build/nyan/firmware/bct/board.bct --bootloader=/build/nyan/firmware/u-boot.bin --loadaddr=0x80108000
+# Where board.bct and u-boot.bin do not have to be prebuilt.
+#
+ChipUid  = 0x00000000000000000000000000000000;
diff --git a/src/mainboard/google/nyan_big/bct/Makefile.inc b/src/mainboard/google/nyan_big/bct/Makefile.inc
index 09af378912..b8501aefa5 100644
--- a/src/mainboard/google/nyan_big/bct/Makefile.inc
+++ b/src/mainboard/google/nyan_big/bct/Makefile.inc
@@ -20,6 +20,7 @@
 bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_EMMC) += emmc.cfg
 bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_SPI) += spi.cfg
 bct-cfg-y += odmdata.cfg
+bct-cfg-y += jtag.cfg
 
 # Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate
 # the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more
diff --git a/src/mainboard/google/nyan_big/bct/jtag.cfg b/src/mainboard/google/nyan_big/bct/jtag.cfg
new file mode 100644
index 0000000000..f43e143377
--- /dev/null
+++ b/src/mainboard/google/nyan_big/bct/jtag.cfg
@@ -0,0 +1,16 @@
+#
+# Set JtagCtrl to 1 to reenable Jtag
+#
+JtagCtrl = 0;
+#
+# Fill in chip unique id
+#
+# ChipUid can be found by running tegrarcm in tegra recovery mode
+# (also hooking up A-A USB cable) and looking for console output
+# on line starting with "Chip UID:"
+#
+# Command example:
+# $ sudo tegrarcm --bct=/build/nyan/firmware/bct/board.bct --bootloader=/build/nyan/firmware/u-boot.bin --loadaddr=0x80108000
+# Where board.bct and u-boot.bin do not have to be prebuilt.
+#
+ChipUid  = 0x00000000000000000000000000000000;
diff --git a/src/mainboard/google/nyan_blaze/bct/Makefile.inc b/src/mainboard/google/nyan_blaze/bct/Makefile.inc
index 0f4afcd483..343d7e894c 100644
--- a/src/mainboard/google/nyan_blaze/bct/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/bct/Makefile.inc
@@ -20,6 +20,7 @@
 bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_EMMC) += emmc.cfg
 bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_SPI) += spi.cfg
 bct-cfg-y += odmdata.cfg
+bct-cfg-y += jtag.cfg
 
 # Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate
 # the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more
diff --git a/src/mainboard/google/nyan_blaze/bct/jtag.cfg b/src/mainboard/google/nyan_blaze/bct/jtag.cfg
new file mode 100644
index 0000000000..f43e143377
--- /dev/null
+++ b/src/mainboard/google/nyan_blaze/bct/jtag.cfg
@@ -0,0 +1,16 @@
+#
+# Set JtagCtrl to 1 to reenable Jtag
+#
+JtagCtrl = 0;
+#
+# Fill in chip unique id
+#
+# ChipUid can be found by running tegrarcm in tegra recovery mode
+# (also hooking up A-A USB cable) and looking for console output
+# on line starting with "Chip UID:"
+#
+# Command example:
+# $ sudo tegrarcm --bct=/build/nyan/firmware/bct/board.bct --bootloader=/build/nyan/firmware/u-boot.bin --loadaddr=0x80108000
+# Where board.bct and u-boot.bin do not have to be prebuilt.
+#
+ChipUid  = 0x00000000000000000000000000000000;