build fixes

heeen · Jul 3, 2015 · 5f7cfd3 · 5f7cfd3
1 parent cd0e5d1
commit 5f7cfd3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -18,8 +18,7 @@ BUILD_BASE	= build
 FW_BASE		= firmware
 
 # base directory for the compiler
-XTENSA_TOOLS_ROOT ?= ../esp-open-sdk/crosstool-NG/builds/xtensa-lx106-elf/bin
-
+XTENSA_TOOLS_ROOT ?= ../esp-open-sdk/xtensa-lx106-elf/bin
 # base directory of the ESP8266 SDK package, absolute
 SDK_BASE	?= ../esp-open-sdk/sdk
 
@@ -120,7 +119,7 @@ all: checkdirs $(TARGET_OUT) $(FW_FILE_1) $(FW_FILE_2)
 
 $(FW_BASE)/%.bin: $(TARGET_OUT) | $(FW_BASE)
 	$(vecho) "FW $(FW_BASE)/"
-	$(Q) $(ESPTOOL) elf2image -o $(FW_BASE)/ $(TARGET_OUT)
+	$(Q) PATH=$(PATH):$(XTENSA_TOOLS_ROOT) $(ESPTOOL) elf2image -o $(FW_BASE)/ $(TARGET_OUT)
 
 $(TARGET_OUT): $(APP_AR)
 	$(vecho) "LD $@"

diff --git a/user/user_main.c b/user/user_main.c
@@ -124,7 +124,7 @@ checkmDns() {
     s_mdns_info->ipAddr = s_ip.ip.addr;
     s_mdns_info->server_name = "iot";
     s_mdns_info->server_port = 8080;
-    s_mdns_info->txt_data = "version = now";
+    s_mdns_info->txt_data[0] = "foo = bar";
     espconn_mdns_init(s_mdns_info);
     //espconn_mdns_server_register();
     espconn_mdns_enable();