Merge branch 'master' into vfs-spiffs

me-no-dev · me-no-dev · commit ee77a24d34c9 · 2017-09-04T22:23:08.000+03:00
diff --git a/component.mk b/component.mk
@@ -1,4 +1,4 @@
-ARDUINO_CORE_LIBS := $(patsubst $(COMPONENT_PATH)/%,%,$(wildcard $(COMPONENT_PATH)/libraries/*/src))
+ARDUINO_CORE_LIBS := $(patsubst $(COMPONENT_PATH)/%,%,$(sort $(dir $(wildcard $(COMPONENT_PATH)/libraries/*/*/))))
 
 COMPONENT_ADD_INCLUDEDIRS := cores/esp32 variants/esp32 $(ARDUINO_CORE_LIBS)
 COMPONENT_PRIV_INCLUDEDIRS := cores/esp32/libb64
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
@@ -109,7 +109,8 @@
         "-Wl,-EL",
         "-T", "esp32.common.ld",
         "-T", "esp32.rom.ld",
-        "-T", "esp32.peripherals.ld"
+        "-T", "esp32.peripherals.ld",
+        "-u", "ld_include_panic_highint_hdl"
     ],
 
     UPLOADERFLAGS=[

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARDUINO_CORE_LIBS := $(patsubst $(COMPONENT_PATH)/%,%,$(wildcard $(COMPONENT_PATH)/libraries/*/src))`
	`1`	`+ARDUINO_CORE_LIBS := $(patsubst $(COMPONENT_PATH)/%,%,$(sort $(dir $(wildcard $(COMPONENT_PATH)/libraries///))))`
`2`	`2`
`3`	`3`	`COMPONENT_ADD_INCLUDEDIRS := cores/esp32 variants/esp32 $(ARDUINO_CORE_LIBS)`
`4`	`4`	`COMPONENT_PRIV_INCLUDEDIRS := cores/esp32/libb64`