summaryrefslogtreecommitdiff
path: root/chip/nrf51
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2017-08-31 18:36:17 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-09-07 15:01:05 -0700
commit0898c7a63a4ccb0f11c1c61bb085d8d062f664ab (patch)
tree328298c6608da573904a497af5985db7280d686f /chip/nrf51
parent096ea20ed18095a967e1829b6ae60b13453416be (diff)
downloadchrome-ec-0898c7a63a4ccb0f11c1c61bb085d8d062f664ab.tar.gz
cleanup: Remove jtag_pre_init()
Use our newly-created chip_pre_init() for doing JTAG initialization. BUG=chromium:747629 BRANCH=None TEST=`make buildall -j` Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org> Change-Id: Ic5771895a214a9f1aa9bd289eef576f52adf973f Reviewed-on: https://chromium-review.googlesource.com/629676 Commit-Ready: Shawn N <shawnn@chromium.org> Tested-by: Shawn N <shawnn@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'chip/nrf51')
-rw-r--r--chip/nrf51/build.mk2
-rw-r--r--chip/nrf51/jtag.c9
2 files changed, 1 insertions, 10 deletions
diff --git a/chip/nrf51/build.mk b/chip/nrf51/build.mk
index 5680f10d91..e5d8ed1b29 100644
--- a/chip/nrf51/build.mk
+++ b/chip/nrf51/build.mk
@@ -11,7 +11,7 @@ CORE:=cortex-m0
CFLAGS_CPU+=-march=armv6-m -mcpu=cortex-m0
chip-y+=gpio.o system.o uart.o
-chip-y+=jtag.o watchdog.o ppi.o
+chip-y+=watchdog.o ppi.o
chip-$(CONFIG_BLUETOOTH_LE)+=radio.o bluetooth_le.o
chip-$(CONFIG_BLUETOOTH_LE_RADIO_TEST)+=radio_test.o
diff --git a/chip/nrf51/jtag.c b/chip/nrf51/jtag.c
deleted file mode 100644
index 6c2ee03323..0000000000
--- a/chip/nrf51/jtag.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2014 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 */
-
-void jtag_pre_init(void)
-{
-}