Skip to content

Commit

Permalink
fix travis jeelabs#8
Browse files Browse the repository at this point in the history
  • Loading branch information
tve committed Sep 23, 2016
1 parent 0952d0a commit 0f2c5ca
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
12 changes: 5 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,11 @@ LIBS = c gcc hal phy pp net80211 wpa main lwip crypto

# compiler flags using during compilation of source files
CFLAGS += -Os -ggdb -std=c99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
-nostdlib -mlongcalls -mtext-section-literals -ffunction-sections -fdata-sections \
-D__ets__ -DICACHE_FLASH -Wno-address -DFIRMWARE_SIZE=$(ESP_FLASH_MAX) \
-DMCU_RESET_PIN=$(MCU_RESET_PIN) -DMCU_ISP_PIN=$(MCU_ISP_PIN) \
-DLED_CONN_PIN=$(LED_CONN_PIN) -DLED_SERIAL_PIN=$(LED_SERIAL_PIN) \
-DVERSION="$(VERSION)"
-nostdlib -mlongcalls -mtext-section-literals -ffunction-sections -fdata-sections \
-D__ets__ -DICACHE_FLASH -Wno-address -DFIRMWARE_SIZE=$(ESP_FLASH_MAX) \
-DMCU_RESET_PIN=$(MCU_RESET_PIN) -DMCU_ISP_PIN=$(MCU_ISP_PIN) \
-DLED_CONN_PIN=$(LED_CONN_PIN) -DLED_SERIAL_PIN=$(LED_SERIAL_PIN) \
-DVERSION="$(VERSION)"

# linker flags used to generate the main object file
LDFLAGS = -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static -Wl,--gc-sections
Expand All @@ -254,7 +254,6 @@ SDK_LDDIR = ld
SDK_INCDIR = include include/json
SDK_TOOLSDIR = tools

$(warning Hello 1)
# select which tools to use as compiler, librarian and linker
CC := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-gcc
AR := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-ar
Expand Down Expand Up @@ -339,7 +338,6 @@ $1/%.o: %.c
$(vecho) "CC $$<"
$(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@
endef
$(warning Hello 2)

.PHONY: all checkdirs clean webpages.espfs wiflash

Expand Down
5 changes: 3 additions & 2 deletions espfs/mkespfsimage/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ clean:

else

CC=gcc
CFLAGS=-I.. -std=gnu99
ifeq ("$(GZIP_COMPRESSION)","yes")
CFLAGS += -DESPFS_GZIP
CFLAGS+= -DESPFS_GZIP
endif

OBJS=main.o
Expand All @@ -52,4 +53,4 @@ endif
clean:
rm -f $(TARGET) $(OBJS)

endif
endif

0 comments on commit 0f2c5ca

Please sign in to comment.