Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix rebase artifacts

Browse source
This commit is contained in:
Jeroen Domburg 2017-04-17 19:05:39 +08:00
parent 363e595c60
commit 3b07fcebb6
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esp32/component.mk
View file

@ -16,9 +16,9 @@ LIBS += net80211 pp wpa smartconfig coexist wps wpa2
endif
ifeq ("$(CONFIG_SPIRAM_CACHE_WORKAROUND)","y")
LINKER_SCRIPTS += esp32.common.ld esp32.rom.ld esp32.peripherals.ld
else
LINKER_SCRIPTS += esp32.common.ld esp32.rom.psram_workaround.ld esp32.peripherals.ld
else
LINKER_SCRIPTS += esp32.common.ld esp32.rom.ld esp32.peripherals.ld
endif
ifeq ("$(CONFIG_NEWLIB_NANO_FORMAT)","y")

2
components/esp32/ld/esp32.rom.ld
View file

@ -327,9 +327,7 @@ PROVIDE ( memccpy = 0x4000c220 );
PROVIDE ( memchr = 0x4000c244 );
PROVIDE ( memcmp = 0x4000c260 );
PROVIDE ( memcpy = 0x4000c2c8 );
/*
PROVIDE ( memmove = 0x4000c3c0 );
*/
PROVIDE ( memrchr = 0x4000c400 );
PROVIDE ( memset = 0x4000c44c );
PROVIDE ( mktime = 0x4005a5e8 );

1
components/esp32/panic.c
View file

@ -242,6 +242,7 @@ void panicHandler(XtExcFrame *frame)
void xt_unhandled_exception(XtExcFrame *frame)
{
//Disable all interrupts, so a backtrace isn't interrupted by needless stuff
int x=0;
asm volatile("wsr %0,INTENABLE\nesync\n"::"r"(x));
haltOtherCore();