Merge branch 'master' into open-startup
This commit is contained in:
commit
7b353b15d5
62 changed files with 1933 additions and 288 deletions
|
@ -178,6 +178,9 @@ void xPortSysTickHandle (void)
|
|||
//OpenNMI();
|
||||
}
|
||||
|
||||
static bool sdk_compat_initialised;
|
||||
void sdk_compat_initialise(void);
|
||||
|
||||
/*
|
||||
* See header file for description.
|
||||
*/
|
||||
|
@ -186,6 +189,14 @@ portBASE_TYPE xPortStartScheduler( void )
|
|||
_xt_isr_attach(INUM_SOFT, SV_ISR);
|
||||
_xt_isr_unmask(BIT(INUM_SOFT));
|
||||
|
||||
/* ENORMOUS HACK: Call the sdk_compat_initialise() function.
|
||||
This can be removed happily once we have open source startup code.
|
||||
*/
|
||||
if(!sdk_compat_initialised) {
|
||||
sdk_compat_initialised = true;
|
||||
sdk_compat_initialise();
|
||||
}
|
||||
|
||||
/* Initialize system tick timer interrupt and schedule the first tick. */
|
||||
sdk__xt_tick_timer_init();
|
||||
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
|
||||
INC_DIRS += $(freertos_MAIN)/include $(freertos_MAIN)/portable/esp8266
|
||||
INC_DIRS += $(freertos_MAIN)include $(freertos_MAIN)portable/esp8266
|
||||
|
||||
# args for passing into compile rule generation
|
||||
freertos_ROOT = $(ROOT)FreeRTOS/
|
||||
freertos_MAIN = $(freertos_ROOT)Source/
|
||||
freertos_INC_DIR = $(freertos_MAIN)include $(freertos_MAIN)portable/esp8266
|
||||
freertos_SRC_DIR = $(freertos_MAIN) $(freertos_MAIN)portable/esp8266
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue