sim-card
/
simtrace2
mirror of https://gerrit.osmocom.org/simtrace2
10
0
Fork 0
Code Issues Releases Wiki Activity

cstartup / USBD: Use correct Makefile conditionals for DFU

This commit is contained in:
Harald Welte 2017-03-02 23:18:02 +01:00
parent adbe72a5ba
commit 0af4948211
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
View File

@ -1163,7 +1163,7 @@ void USBD_IrqHandler(void)
TRACE_INFO_WP("EoBRes ");
#if defined(BOARD_USB_DFU) && defined(dfu)
#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
if (g_dfu->past_manifest)
USBDFU_SwitchToApp();
#endif

5
firmware/libboard/common/source/board_cstartup_gnu.c
View File

@ -124,7 +124,7 @@ IntFunc exception_table[] = {
IrqHandlerNotUsed /* 35 not used */
};
#if defined (BOARD_USB_DFU) && !defined(dfu)
#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
static void BootIntoApp(void)
{
unsigned int *pSrc;
@ -151,7 +151,8 @@ void ResetException( void )
/* Low level Initialize */
LowLevelInit() ;
#if defined (BOARD_USB_DFU) && !defined(dfu)
#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
if (*(unsigned long *)IRAM_ADDR != 0xDFDFDFDF)
BootIntoApp();
#endif