catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-28 19:28:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

cstartup / USBD: Use correct Makefile conditionals for DFU

Browse Source
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
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 "); TRACE_INFO_WP("EoBRes ");
#if defined(BOARD_USB_DFU) && defined(dfu) #if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
if (g_dfu->past_manifest) if (g_dfu->past_manifest)
USBDFU_SwitchToApp(); USBDFU_SwitchToApp();
#endif #endif

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

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