diff --git a/board/daisy/board.c b/board/daisy/board.c
index c967cae6f1..fdda1f0f1f 100644
--- a/board/daisy/board.c
+++ b/board/daisy/board.c
@@ -42,35 +42,3 @@ void configure_board(void)
 	/* Select Alternate function for USART1 on pins PA9/PA10 */
         gpio_set_alternate_function(GPIO_A, (1<<9) | (1<<10), GPIO_ALT_USART);
 }
-
-/**
- * Stubs for non implemented drivers
- * TODO: implement
- */
-int jtag_pre_init(void)
-{
-	/* stop TIM2, TIM3 and watchdogs when the JTAG stops the CPU */
-	STM32L_DBGMCU_APB1FZ |= 0x00001803;
-
-	return EC_SUCCESS;
-}
-
-int eeprom_init(void)
-{
-	return EC_SUCCESS;
-}
-
-int i2c_init(void)
-{
-	return EC_SUCCESS;
-}
-
-int power_button_init(void)
-{
-	return EC_SUCCESS;
-}
-
-int adc_init(void)
-{
-	return EC_SUCCESS;
-}
diff --git a/board/discovery/board.c b/board/discovery/board.c
index b43e761fc7..0669bc1187 100644
--- a/board/discovery/board.c
+++ b/board/discovery/board.c
@@ -34,35 +34,3 @@ void configure_board(void)
         gpio_set_alternate_function(GPIO_B, (1<<10) | (1<<11), GPIO_ALT_USART);
 #endif
 }
-
-/**
- * Stubs for non implemented drivers
- * TODO: implement
- */
-int jtag_pre_init(void)
-{
-	/* stop TIM2, TIM3 and watchdogs when the JTAG stops the CPU */
-	STM32L_DBGMCU_APB1FZ |= 0x00001803;
-
-	return EC_SUCCESS;
-}
-
-int eeprom_init(void)
-{
-	return EC_SUCCESS;
-}
-
-int i2c_init(void)
-{
-	return EC_SUCCESS;
-}
-
-int power_button_init(void)
-{
-	return EC_SUCCESS;
-}
-
-int adc_init(void)
-{
-	return EC_SUCCESS;
-}
diff --git a/chip/stm32l/build.mk b/chip/stm32l/build.mk
index 6f7c8bcda1..d8a0b28c07 100644
--- a/chip/stm32l/build.mk
+++ b/chip/stm32l/build.mk
@@ -9,4 +9,5 @@
 CORE:=cortex-m
 
 chip-y=uart.o clock.o hwtimer.o system.o gpio.o
+chip-y+=jtag.o stubs.o
 chip-$(CONFIG_TASK_WATCHDOG)+=watchdog.o
diff --git a/chip/stm32l/jtag.c b/chip/stm32l/jtag.c
new file mode 100644
index 0000000000..fd7f826418
--- /dev/null
+++ b/chip/stm32l/jtag.c
@@ -0,0 +1,16 @@
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+/* Settings to enable JTAG debugging */
+
+#include "jtag.h"
+#include "registers.h"
+
+int jtag_pre_init(void)
+{
+	/* stop TIM2, TIM3 and watchdogs when the JTAG stops the CPU */
+	STM32L_DBGMCU_APB1FZ |= 0x00001803;
+
+	return EC_SUCCESS;
+}
diff --git a/chip/stm32l/stubs.c b/chip/stm32l/stubs.c
new file mode 100644
index 0000000000..cf585c8012
--- /dev/null
+++ b/chip/stm32l/stubs.c
@@ -0,0 +1,30 @@
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+/* Stubs for non implemented drivers */
+
+#include "common.h"
+
+/**
+ * TODO: implement
+ */
+int eeprom_init(void)
+{
+	return EC_SUCCESS;
+}
+
+int i2c_init(void)
+{
+	return EC_SUCCESS;
+}
+
+int power_button_init(void)
+{
+	return EC_SUCCESS;
+}
+
+int adc_init(void)
+{
+	return EC_SUCCESS;
+}