From f427529a30487de45ebfbe6fbba9c290738878ab Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 30 Jun 2012 11:19:07 +0900 Subject: Fix bootloader.c --- protocol/pjrc.mk | 3 +-- protocol/pjrc/bootloader_teensy.c | 40 --------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 protocol/pjrc/bootloader_teensy.c (limited to 'protocol') diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk index 1ceee0ad9..8aff6f28b 100644 --- a/protocol/pjrc.mk +++ b/protocol/pjrc.mk @@ -5,8 +5,7 @@ OPT_DEFS += -DHOST_PJRC SRC += $(PJRC_DIR)/pjrc.c \ $(PJRC_DIR)/usb_keyboard.c \ $(PJRC_DIR)/usb_debug.c \ - $(PJRC_DIR)/usb.c \ - $(PJRC_DIR)/bootloader_teensy.c + $(PJRC_DIR)/usb.c # Option modules ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) diff --git a/protocol/pjrc/bootloader_teensy.c b/protocol/pjrc/bootloader_teensy.c deleted file mode 100644 index 9d34852f1..000000000 --- a/protocol/pjrc/bootloader_teensy.c +++ /dev/null @@ -1,40 +0,0 @@ -/* See http://www.pjrc.com/teensy/jump_to_bootloader.html */ -#include -#include -#include -#include "bootloader.h" - -void bootloader_jump(void) { - cli(); - // disable watchdog, if enabled - // disable all peripherals - UDCON = 1; - USBCON = (1<