<p>tsaitgaist has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16096">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add DFU enter override capability<br><br>in case flashing the main application firmware using DFU failed,<br>the main application might be broken and not allow to switch again<br>to DFU mode to re-flash it correctly.<br>the other board have a way to force entering (e.g. staying in) the<br>bootloader using an external signal (e.g. a switch on the SIMtrace<br>board).<br>the OWHW DFU firmware did not have this functionality implemented.<br>the design (e.g. schematic) already has the SIMTRACE_BOOTLOADER<br>signal (on PA31) for this purpose.<br>now the DFU bootloader will start the DFU mode when the<br>SIMTRACE_BOOTLOADER is high.<br><br>this change has been tested on OWHWv2.<br><br>Change-Id: Iefff51a811ad0f3bf3a46b8e256b905d11344bea<br>---<br>M firmware/libboard/owhw/include/board.h<br>M firmware/libboard/owhw/source/owhw.c<br>2 files changed, 17 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/96/16096/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libboard/owhw/include/board.h b/firmware/libboard/owhw/include/board.h</span><br><span>index 44472d0..f929771 100644</span><br><span>--- a/firmware/libboard/owhw/include/board.h</span><br><span>+++ b/firmware/libboard/owhw/include/board.h</span><br><span>@@ -46,6 +46,9 @@</span><br><span> /** index for green LED in LEDs pin definition array */</span><br><span> #define LED_NUM_GREEN 1</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* pin connected to the SIMTRACE_BOOTLOADER signal. set high to force DFU bootloader start */</span><br><span style="color: hsl(120, 100%, 40%);">+#define PIN_BOOTLOADER {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* USIM 2 interface (USART) */</span><br><span> #define PIN_USIM2_CLK {PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}</span><br><span> #define PIN_USIM2_IO {PIO_PA6, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}</span><br><span>diff --git a/firmware/libboard/owhw/source/owhw.c b/firmware/libboard/owhw/source/owhw.c</span><br><span>index 3bf51ec..516d592 100644</span><br><span>--- a/firmware/libboard/owhw/source/owhw.c</span><br><span>+++ b/firmware/libboard/owhw/source/owhw.c</span><br><span>@@ -1,7 +1,7 @@</span><br><span> /* Card simulator specific functions</span><br><span> *</span><br><span> * (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de></span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de></span><br><span> *</span><br><span> * This program is free software; you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU General Public License as published by</span><br><span>@@ -65,3 +65,16 @@</span><br><span> {</span><br><span> PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int board_override_enter_dfu(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const Pin bl_pin = PIN_BOOTLOADER;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PIO_Configure(&bl_pin, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (PIO_Get(&bl_pin) == 0) { // signal low</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0; // do not override enter DFU</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1; // override enter DFU</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16096">change 16096</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/16096"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iefff51a811ad0f3bf3a46b8e256b905d11344bea </div>
<div style="display:none"> Gerrit-Change-Number: 16096 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: tsaitgaist <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>