clean up

Author: Brian Friedkin

build/devices/esp/sdk/ld/win/eagle.app.v6.common.ld

@@ -209,32 +209,6 @@ SECTIONS
     *.cpp.o(.iram.text)
     *.c.o(.iram.text)
     *.o(.iram.text)
-/* SDK libraries expect their .text sections in iram, not irom */
-	*libmain.a*:*(.literal .text .literal.* .text.*)
-	*libnet80211.a*:*(.literal .text .literal.* .text.*)
-	*libphy.a*:*(.literal .text .literal.* .text.*)
-	*libpp.a*:*(.literal .text .literal.* .text.*)
-	*libwpa.a*:*(.literal .text .literal.* .text.*)
-/*end: SDK libraries expect their .text sections in iram, not irom */
-/* some math integer */
-	*libgcc.a:*i3.o(.literal .text .literal.* .text.*)
-/* libc */
-	*libc.a:*malloc.o(.literal .text .literal.* .text.*)
-	*libc.a:*mallocr.o(.literal .text .literal.* .text.*)
-	*libc.a:*freer.o(.literal .text .literal.* .text.*)
-	*libc.a:*memcpy.o(.literal .text .literal.* .text.*)
-	*libc.a:*memset.o(.literal .text .literal.* .text.*)
-	*libc.a:*memcmp.o(.literal .text .literal.* .text.*)
-	*libc.a:*memmove.o(.literal .text .literal.* .text.*)
-	*libc.a:*rand.o(.literal .text .literal.* .text.*)
-	*libc.a:*bzero.o(.literal .text .literal.* .text.*)
-	*libc.a:*lock.o(.literal .text .literal.* .text.*)
-	*libc.a:*printf.o(.literal .text .literal.* .text.*)
-	*libc.a:*findfp.o(.literal .text .literal.* .text.*)
-	*libc.a:*fputwc.o(.literal .text .literal.* .text.*)
-
-	*libhal.a:*set_intset.o(.literal .text .literal.* .text.*)
-
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)

tools/mcconfig/nmake.esp.mk

@@ -199,16 +199,17 @@ ESPTOOL = $(ESP_SDK_DIR)\esptool.exe
 
 AR_OPTIONS = rcs
 
-BUILDCLUT = $(BUILD_DIR)\bin\win\release\buildclut
-COMPRESSBMF = $(BUILD_DIR)\bin\win\release\compressbmf
-RLE4ENCODE = $(BUILD_DIR)\bin\win\release\rle4encode
-MCLOCAL = $(BUILD_DIR)\bin\win\release\mclocal
-MCREZ = $(BUILD_DIR)\bin\win\release\mcrez
-PNG2BMP = $(BUILD_DIR)\bin\win\release\png2bmp
-IMAGE2CS = $(BUILD_DIR)\bin\win\release\image2cs
-XSC = $(BUILD_DIR)\bin\win\release\xsc
-XSID = $(BUILD_DIR)\bin\win\release\xsid
-XSL = $(BUILD_DIR)\bin\win\release\xsl
+MODDABLE_TOOLS_DIR = $(BUILD_DIR)\bin\win\release
+BUILDCLUT = $(MODDABLE_TOOLS_DIR)\buildclut
+COMPRESSBMF = $(MODDABLE_TOOLS_DIR)\compressbmf
+RLE4ENCODE = $(MODDABLE_TOOLS_DIR)\rle4encode
+MCLOCAL = $(MODDABLE_TOOLS_DIR)\mclocal
+MCREZ = $(MODDABLE_TOOLS_DIR)\mcrez
+PNG2BMP = $(MODDABLE_TOOLS_DIR)\png2bmp
+IMAGE2CS = $(MODDABLE_TOOLS_DIR)\image2cs
+XSC = $(MODDABLE_TOOLS_DIR)\xsc
+XSID = $(MODDABLE_TOOLS_DIR)\xsid
+XSL = $(MODDABLE_TOOLS_DIR)\xsl
 
 LD_DIRS = \
 	-L$(MODDABLE)\build\devices\esp\sdk\ld\win \
@@ -354,23 +355,27 @@ $(LIB_DIR)\cont.S.o: $(CORE_DIR)\cont.S
 	$(AR) $(AR_OPTIONS) $(LIB_ARCHIVE) $@
 
 {$(CORE_DIR)\umm_malloc\}.c{$(LIB_DIR)\}.o:
-	@echo # cc umm_malloc $(@F)
+	@echo # cc $(@F)
 	$(CC) $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) $? -o $@
 	$(AR) $(AR_OPTIONS) $(LIB_ARCHIVE) $@
 
 $(LIB_DIR)\e_fmod.o: $(PLATFORM_DIR)\lib\fmod\e_fmod.c
+	@echo # cc $(@F)
 	$(CC) $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) $? -o $@
 	$(AR) $(AR_OPTIONS) $(LIB_ARCHIVE) $@
 
 $(LIB_DIR)\rtctime.o: $(PLATFORM_DIR)\lib\rtc\rtctime.c
+	@echo # cc $(@F)
 	$(CC) $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) $? -o $@
 	$(AR) $(AR_OPTIONS) $(LIB_ARCHIVE) $@
 
 $(LIB_DIR)\tinyprintf.o: $(PLATFORM_DIR)\lib\tinyprintf\tinyprintf.c
+	@echo # cc $(@F)
 	$(CC) $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) $? -o $@
 	$(AR) $(AR_OPTIONS) $(LIB_ARCHIVE) $@
 
 $(LIB_DIR)\tinyuart.o: $(PLATFORM_DIR)\lib\tinyuart\tinyuart.c
+	@echo # cc $(@F)
 	$(CC) $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) $? -o $@
 	$(AR) $(AR_OPTIONS) $(LIB_ARCHIVE) $@