From 3b07fcebb654ee4aa03a46f4ee14e031fef6064e Mon Sep 17 00:00:00 2001
From: Jeroen Domburg <jeroen@espressif.com>
Date: Mon, 17 Apr 2017 19:05:39 +0800
Subject: [PATCH] Fix rebase artifacts

---
 components/esp32/component.mk    | 4 ++--
 components/esp32/ld/esp32.rom.ld | 2 --
 components/esp32/panic.c         | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/esp32/component.mk b/components/esp32/component.mk
index e6021c29f..b69ee11a3 100644
--- a/components/esp32/component.mk
+++ b/components/esp32/component.mk
@@ -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")
diff --git a/components/esp32/ld/esp32.rom.ld b/components/esp32/ld/esp32.rom.ld
index e2d5df6b5..9981e59f5 100644
--- a/components/esp32/ld/esp32.rom.ld
+++ b/components/esp32/ld/esp32.rom.ld
@@ -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 );
diff --git a/components/esp32/panic.c b/components/esp32/panic.c
index dd3bda990..6e8e744b1 100644
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@ -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();