Browse Source
Hello, appended 3 patches - adds a dfu-bootloader appliaction - uses absolute delays when waiting for pull-up delays on the STLINK (hopefully fixes issue #30) Updating the dfu-bootloader by additional application is helpfull for the STLINK, as for flashing the bootloader by SWDb otherwise jumpers need to be soldered or external SWD is not possible. Use like: - dfu-util -s 0x08002000:leave -D dfu_upgrade.bin - dfu-util -s 0x08000000:leave -D blackmagic_dfu.bin - Push reset buttom and reconnect to enter new dfu bootloader - dfu-util -s 0x08002000:leave -D blackmagic.bin -- Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- >From fae5022c304a8866f056ea66660ac7ce3809dcf8 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> Date: Sun, 20 Oct 2013 15:00:36 +0200 Subject: F1: Prepare to update dfu bootloader via DFU with additional application.pull/36/merge
bon@elektron.ikp.physik.tu-darmstadt.de
11 years ago
committed by
Gareth McMullin
Gareth McMullin
12 changed files with 209 additions and 38 deletions
@ -0,0 +1,127 @@ |
|||
/*
|
|||
* This file is part of the Black Magic Debug project. |
|||
* |
|||
* Copyright (C) 2013 Gareth McMullin <gareth@blacksphere.co.nz> |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
#include <string.h> |
|||
#include <libopencm3/cm3/systick.h> |
|||
#include <libopencm3/stm32/rcc.h> |
|||
#include <libopencm3/stm32/gpio.h> |
|||
#include <libopencm3/cm3/scb.h> |
|||
|
|||
#include "usbdfu.h" |
|||
uint32_t app_address = 0x08000000; |
|||
|
|||
static uint8_t rev; |
|||
static uint16_t led_idle_run; |
|||
static uint32_t led2_state = 0; |
|||
|
|||
void dfu_detach(void) |
|||
{ |
|||
/* Disconnect USB cable by resetting USB Device
|
|||
and pulling USB_DP low*/ |
|||
rcc_peripheral_reset(&RCC_APB1RSTR, RCC_APB1ENR_USBEN); |
|||
rcc_peripheral_clear_reset(&RCC_APB1RSTR, RCC_APB1ENR_USBEN); |
|||
rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USBEN); |
|||
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); |
|||
gpio_clear(GPIOA, GPIO12); |
|||
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, |
|||
GPIO_CNF_OUTPUT_OPENDRAIN, GPIO12); |
|||
/* Pull PB0 (T_NRST) low
|
|||
*/ |
|||
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN); |
|||
gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ, |
|||
GPIO_CNF_OUTPUT_OPENDRAIN, GPIO0); |
|||
gpio_clear(GPIOB, GPIO0); |
|||
SCB_VTOR = 0; |
|||
scb_reset_core(); |
|||
} |
|||
|
|||
void stlink_set_rev(void) |
|||
{ |
|||
int i; |
|||
|
|||
/* First, get Board revision by pulling PC13/14 up. Read
|
|||
* 11 for ST-Link V1, e.g. on VL Discovery, tag as rev 0 |
|||
* 10 for ST-Link V2, e.g. on F4 Discovery, tag as rev 1 |
|||
*/ |
|||
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN); |
|||
gpio_set_mode(GPIOC, GPIO_MODE_INPUT, |
|||
GPIO_CNF_INPUT_PULL_UPDOWN, GPIO14 | GPIO13); |
|||
gpio_set(GPIOC, GPIO14 | GPIO13); |
|||
for (i = 0; i < 100; i++) |
|||
rev = (~(gpio_get(GPIOC, GPIO14 | GPIO13)) >> 13) & 3; |
|||
|
|||
switch (rev) { |
|||
case 0: |
|||
led_idle_run = GPIO8; |
|||
break; |
|||
default: |
|||
led_idle_run = GPIO9; |
|||
} |
|||
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, |
|||
GPIO_CNF_OUTPUT_PUSHPULL, led_idle_run); |
|||
} |
|||
|
|||
int main(void) |
|||
{ |
|||
|
|||
rcc_clock_setup_in_hse_8mhz_out_72mhz(); |
|||
|
|||
stlink_set_rev(); |
|||
|
|||
systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8); |
|||
systick_set_reload(900000); |
|||
|
|||
dfu_protect(UPD_MODE); |
|||
|
|||
/* Handle USB disconnect/connect */ |
|||
/* Just in case: Disconnect USB cable by resetting USB Device
|
|||
* and pulling USB_DP low |
|||
* Device will reconnect automatically as Pull-Up is hard wired*/ |
|||
rcc_peripheral_reset(&RCC_APB1RSTR, RCC_APB1ENR_USBEN); |
|||
rcc_peripheral_clear_reset(&RCC_APB1RSTR, RCC_APB1ENR_USBEN); |
|||
rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USBEN); |
|||
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); |
|||
gpio_clear(GPIOA, GPIO12); |
|||
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, |
|||
GPIO_CNF_OUTPUT_OPENDRAIN, GPIO12); |
|||
|
|||
systick_interrupt_enable(); |
|||
systick_counter_enable(); |
|||
|
|||
dfu_init(&stm32f103_usb_driver, UPD_MODE); |
|||
|
|||
dfu_main(); |
|||
} |
|||
|
|||
void sys_tick_handler(void) |
|||
{ |
|||
if (rev == 0) { |
|||
gpio_toggle(GPIOA, led_idle_run); |
|||
} else { |
|||
if (led2_state & 1) { |
|||
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, |
|||
GPIO_CNF_OUTPUT_PUSHPULL, led_idle_run); |
|||
gpio_set(GPIOA, led_idle_run); |
|||
} else { |
|||
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, |
|||
GPIO_CNF_INPUT_ANALOG, led_idle_run); |
|||
} |
|||
led2_state++; |
|||
} |
|||
} |
|||
Loading…
Reference in new issue