Fix WM W600 build

platforms/embedded/wm_w600/Makefile

@@ -32,9 +32,9 @@ SUBDIRS += \
 	$(TOP_DIR)/platform/common 		\
 	$(TOP_DIR)/platform/drivers		\
 	$(TOP_DIR)/platform/sys			\
-	$(TOP_DIR)/src/network	\
-	$(TOP_DIR)/src/os			\
-	$(TOP_DIR)/src/app
+	$(TOP_DIR)/src/os				\
+	$(TOP_DIR)/src/app				\
+	$(TOP_DIR)/src/network
 endif
 endif
 
@@ -48,28 +48,25 @@ COMPONENTS_$(TARGET) += \
 	$(TOP_DIR)/platform/common/libcommon$(LIB_EXT)		\
 	$(TOP_DIR)/platform/drivers/libdrivers$(LIB_EXT)		\
 	$(TOP_DIR)/platform/sys/libsys$(LIB_EXT)			\
-	$(TOP_DIR)/src/network/libnetwork$(LIB_EXT)	\
-	$(TOP_DIR)/src/os/libos$(LIB_EXT)			\
+	$(TOP_DIR)/src/os/libos$(LIB_EXT)					\
+	$(TOP_DIR)/src/network/libnetwork$(LIB_EXT)					\
 	$(TOP_DIR)/src/app/libapp$(LIB_EXT)
 endif
 
-
-LINKLIB = 	\
-	$(TOP_DIR)/lib/libwlan$(LIB_EXT)			\
-	$(TOP_DIR)/lib/libairkiss_log$(LIB_EXT)
-
-LINKLIB += -lm
-
 ifeq ($(USE_LIB), 1)
-LINKLIB += \
+LINKLIB = \
 	$(TOP_DIR)/lib/libcommon$(LIB_EXT) 		\
 	$(TOP_DIR)/lib/libdrivers$(LIB_EXT)		\
 	$(TOP_DIR)/lib/libsys$(LIB_EXT)			\
-	$(TOP_DIR)/lib/libnetwork$(LIB_EXT)		\
 	$(TOP_DIR)/lib/libos$(LIB_EXT)			\
+	$(TOP_DIR)/lib/libnetwork$(LIB_EXT)		\
 	$(TOP_DIR)/lib/libapp$(LIB_EXT)
 endif
 
+LINKLIB += 	\
+	$(TOP_DIR)/lib/libairkiss_log$(LIB_EXT)	\
+	$(TOP_DIR)/lib/libwlan$(LIB_EXT) 
+	
 ifeq ($(COMPILE), gcc)
 LINKFLAGS_$(TARGET) =  \
 	$(LINKLIB)	\
@@ -90,12 +87,17 @@ endif
 #   for a subtree within the makefile rooted therein
 #
 
-DEFINES = -DWM_W600 -Os -flto -Wfatal-errors \
+CONFIGURATION_DEFINES += -DWM_W600
+
+DEFINES += $(CONFIGURATION_DEFINES) -Os -flto -Wfatal-errors \
+			-fomit-frame-pointer -fno-stack-check -fno-stack-protector \
 			-Wno-unused-function -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers
 #			-Dd_m3FixedHeap=8192
 #			-fno-optimize-sibling-calls
 
-LINKFLAGS_$(TARGET) += $(DEFINES)
+LINKFLAGS_$(TARGET) += -Os -flto
+
+LINKLIB += -lm
 
 #############################################################
 # Recursion Magic - Don't touch this!!
@@ -110,7 +112,7 @@ LINKFLAGS_$(TARGET) += $(DEFINES)
 #
 
 INCLUDES := $(INCLUDES) -I$(PDIR)include
-INCLUDES += -I ./
+INCLUDES += -I ./ -I ./wasm3/
 
 sinclude $(TOP_DIR)/tools/rules.mk
 

platforms/embedded/wm_w600/README.md

@@ -3,13 +3,16 @@
 You will need:
 
 - [W600 SDK from ThingsTurn](https://github.com/w600/sdk)
+  `git clone --depth=1 --branch=sdk_v3.2.0 https://github.com/w600/sdk.git /opt/w600-sdk`
 - [gcc-arm-none-eabi-4_9-2015q3](https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update)
 - [w600tool](https://github.com/vshymanskyy/w600tool)
 
 ```sh
 export PATH=/opt/gcc-arm-none-eabi-4_9-2015q3/bin:$PATH
 
-export WM_SDK=/opt/WM_W600
+export PATH=/opt/w600tool:$PATH
+
+export WM_SDK=/opt/w600-sdk
 
 ./build.sh
 ```

platforms/embedded/wm_w600/main.c

@@ -7,9 +7,9 @@
 
 #include "wm_include.h"
 
-#include "m3/wasm3.h"
+#include "wasm3.h"
 
-#include "m3/extra/fib32.wasm.h"
+#include "extra/fib32.wasm.h"
 
 #define FATAL(msg, ...) { printf("Fatal: " msg "\n", ##__VA_ARGS__); return; }
 
@@ -72,6 +72,11 @@ void wasm3_task(void *data)
     printf("Elapsed: %ld ms\n", (end - start));
 }
 
+void pre_gpio_config(void)
+{
+
+}
+
 void UserMain(void)
 {
     /* create task */