diff --git a/tcl/board/ti_beaglebone-base.cfg b/tcl/board/ti_beaglebone-base.cfg
new file mode 100644
index 000000000..82d3c312b
--- /dev/null
+++ b/tcl/board/ti_beaglebone-base.cfg
@@ -0,0 +1,4 @@
+# AM335x Beaglebone family base configuration
+#  http://beagleboard.org/bone
+
+source [find target/am335x.cfg]
diff --git a/tcl/board/ti_beaglebone.cfg b/tcl/board/ti_beaglebone.cfg
index 5d31d1d97..a54ad6275 100644
--- a/tcl/board/ti_beaglebone.cfg
+++ b/tcl/board/ti_beaglebone.cfg
@@ -6,8 +6,8 @@ source [find interface/ftdi/xds100v2.cfg]
 
 adapter_khz 16000
 
-source [find target/am335x.cfg]
-
 reset_config trst_and_srst
 
+source [find board/ti_beaglebone-base.cfg]
+
 
diff --git a/tcl/board/ti_beaglebone_black.cfg b/tcl/board/ti_beaglebone_black.cfg
new file mode 100644
index 000000000..79fc1e8a8
--- /dev/null
+++ b/tcl/board/ti_beaglebone_black.cfg
@@ -0,0 +1,8 @@
+# AM335x Beaglebone Black
+#  http://beagleboard.org/bone
+
+adapter_khz 1000
+
+reset_config trst_and_srst
+
+source [find board/ti_beaglebone-base.cfg]