fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove need for esptool-ck

Browse source
This commit is contained in:
con-f-use 2016-08-03 20:29:44 +02:00
parent 6f1ab3059a
commit 0eafb88c47
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
embedded8266/Makefile
View file

@ -18,8 +18,8 @@ OPTS += -DICACHE_FLASH
.PHONY : all clean cleanall netburn burnweb burn .PHONY : all clean cleanall netburn burnweb burn
uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))) uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
FW_FILE_1 = 0x00000.bin FW_FILE1 = image.elf-0x00000.bin
FW_FILE_2 = 0x40000.bin FW_FILE2 = image.elf-0x40000.bin
TARGET = image.elf TARGET = image.elf
SRCS = \ SRCS = \
@ -44,7 +44,6 @@ INCL = $(SDK)/include myclib include .
GCC_FOLDER = $(ESP_ROOT)/xtensa-lx106-elf GCC_FOLDER = $(ESP_ROOT)/xtensa-lx106-elf
ESPTOOL_PY = $(ESP_ROOT)/esptool/esptool.py ESPTOOL_PY = $(ESP_ROOT)/esptool/esptool.py
FW_TOOL = $(ESP_ROOT)/../esptool-ck/esptool
SDK = $(ESP_ROOT)/sdk SDK = $(ESP_ROOT)/sdk
XTLIB = $(SDK)/lib XTLIB = $(SDK)/lib
@ -64,26 +63,21 @@ LINKFLAGS = $(LDFLAGS_CORE) -B$(XTLIB)
##########################################################################RULES ##########################################################################RULES
all : $(FW_FILE_1) $(FW_FILE_2) all : $(FW_FILE1) $(FW_FILE2)
$(FW_FILE_1): $(TARGET) $(FW_FILE1) $(FW_FILE2) : $(TARGET)
@echo "FW $@" @echo "FW $@"
$(FW_TOOL) -eo $(TARGET) -bo $@ -bs .text -bs .data -bs .rodata -bc -ec PATH=$(FOLDERPREFIX):$$PATH;$(ESPTOOL_PY) elf2image $(TARGET)
$(FW_FILE_2): $(TARGET)
@echo "FW $@"
$(FW_TOOL) -eo $(TARGET) -es .irom0.text $@ -ec
$(TARGET) : $(SRCS) $(TARGET) : $(SRCS)
$(CC) $(CFLAGS) $^ $(LINKFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LINKFLAGS) -o $@
# $(LD) $^ $(LDFLAGS) -o $@
ifeq ($(CHIP), 8285) ifeq ($(CHIP), 8285)
burn : $(FW_FILE_1) $(FW_FILE_2) burn : $(FW_FILE_1) $(FW_FILE_2)
($(ESPTOOL_PY) --port $(PORT) write_flash -fs 8m -fm dout 0x00000 0x00000.bin 0x40000 0x40000.bin)||(true) ($(ESPTOOL_PY) --port $(PORT) write_flash -fs 8m -fm dout 0x00000 0x00000.bin 0x40000 0x40000.bin)||(true)
else ifeq ($(CHIP), 8266) else ifeq ($(CHIP), 8266)
burn : $(FW_FILE_1) $(FW_FILE_2) burn : $(FW_FILE_1) $(FW_FILE_2)
($(ESPTOOL_PY) --port $(PORT) write_flash 0x00000 0x00000.bin 0x40000 0x40000.bin)||(true) ($(ESPTOOL_PY) --port $(PORT) write_flash 0x00000 $(FW_FILE1) 0x40000 $(FW_FILE2))||(true)
else else
$(error Error: Unknown chip '$(CHIP)') $(error Error: Unknown chip '$(CHIP)')
endif endif
@ -95,8 +89,8 @@ endif
burnweb : web/page.mpfs burnweb : web/page.mpfs
($(ESPTOOL_PY) --port $(PORT) write_flash 0x10000 web/page.mpfs)||(true) ($(ESPTOOL_PY) --port $(PORT) write_flash 0x10000 web/page.mpfs)||(true)
netburn : image.elf $(FW_FILE_1) $(FW_FILE_2) netburn : $(FW_FILE1) $(FW_FILE2) web/execute_reflash
web/execute_reflash $(IP) 0x00000.bin 0x40000.bin web/execute_reflash $(IP) $(FW_FILE1) $(FW_FILE2)
clean : clean :
$(RM) $(patsubst %.c,%.o,$(SRCS)) $(TARGET) $(RM) $(patsubst %.c,%.o,$(SRCS)) $(TARGET)