search

raburton / esp8266

Various bits of code for ESP8266
http://richard.burtons.org/
183 stars 47 forks source link

Help edit the Makefile #29

Closed fvpalha closed 8 years ago

fvpalha commented 9 years ago

Hi Richard.

Please, I need a help to build the ROM.

I am trying to add the target "otaall".

#############################################################
#
# Root Level Makefile
#
# (c) by CHERTS <sleuthhound@gmail.com>
#
#############################################################

BUILD_BASE  = build
FW_BASE     = firmware

# Base directory for the compiler
XTENSA_TOOLS_ROOT ?= c:/Espressif/xtensa-lx106-elf/bin

# base directory of the ESP8266 SDK package, absolute
SDK_BASE    ?= c:/Espressif/ESP8266_SDK

# esptool path and port
SDK_TOOLS   ?= c:/Espressif/utils
ESPTOOL     ?= $(SDK_TOOLS)/esptool.exe
ESPPORT     ?= COM1
ESPBAUD     ?= 115200

# BOOT = none
# BOOT = old - boot_v1.1
# BOOT = new - boot_v1.3+
BOOT?=none
# APP = 0 - eagle.flash.bin + eagle.irom0text.bin
# APP = 1 - user1.bin
# APP = 2 - user2.bin
APP?=0
# SPI_SPEED = 20MHz, 26.7MHz, 40MHz, 80MHz
SPI_SPEED?=40
# SPI_MODE: QIO, QOUT, DIO, DOUT
SPI_MODE?=QIO
# SPI_SIZE: 256KB, 512KB, 1024KB, 2048KB, 4096KB
SPI_SIZE?=512
#SPI_SIZE?=1024

ifeq ($(BOOT), new)
    boot = new
else
    ifeq ($(BOOT), old)
        boot = old
    else
        boot = none
    endif
endif

ifeq ($(APP), 1)
    app = 1
else
    ifeq ($(APP), 2)
        app = 2
    else
        app = 0
    endif
endif

ifeq ($(SPI_SPEED), 26.7)
    freqdiv = 1
    flashimageoptions = -ff 26m
else
    ifeq ($(SPI_SPEED), 20)
        freqdiv = 2
        flashimageoptions = -ff 20m
    else
        ifeq ($(SPI_SPEED), 80)
            freqdiv = 15
            flashimageoptions = -ff 80m
        else
            freqdiv = 0
            flashimageoptions = -ff 40m
        endif
    endif
endif

ifeq ($(SPI_MODE), QOUT)
    mode = 1
    flashimageoptions += -fm qout
else
    ifeq ($(SPI_MODE), DIO)
        mode = 2
        flashimageoptions += -fm dio
    else
        ifeq ($(SPI_MODE), DOUT)
            mode = 3
            flashimageoptions += -fm dout
        else
            mode = 0
            flashimageoptions += -fm qio
        endif
    endif
endif

# flash larger than 1024KB only use 1024KB to storage user1.bin and user2.bin
ifeq ($(SPI_SIZE), 256)
    size = 1
    flash = 256
    flashimageoptions += -fs 2m
else
    ifeq ($(SPI_SIZE), 1024)
        size = 2
        flash = 1024
        flashimageoptions += -fs 8m
    else
        ifeq ($(SPI_SIZE), 2048)
            size = 3
            flash = 1024
            flashimageoptions += -fs 16m
        else
            ifeq ($(SPI_SIZE), 4096)
                size = 4
                flash = 1024
                flashimageoptions += -fs 32m
            else
                size = 0
                flash = 512
                flashimageoptions += -fs 4m
            endif
        endif
    endif
endif

ifeq ($(flash), 512)
  ifeq ($(app), 1)
    addr = 0x01000
  else
    ifeq ($(app), 2)
      addr = 0x41000
    endif
  endif
else
  ifeq ($(flash), 1024)
    ifeq ($(app), 1)
      addr = 0x01000
    else
      ifeq ($(app), 2)
        addr = 0x81000
      endif
    endif
  endif
endif

# name for the target project
TARGET      = app

# which modules (subdirectories) of the project to include in compiling
MODULES     = driver user
EXTRA_INCDIR    = include $(SDK_BASE)/../include

# libraries used in this project, mainly provided by the SDK
LIBS        = c gcc hal phy pp net80211 lwip wpa main

# compiler flags using during compilation of source files
CFLAGS      = -Os -g -O2 -std=gnu90 -Wpointer-arith -Wundef -Werror -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -mno-serialize-volatile -D__ets__ -DICACHE_FLASH

# linker flags used to generate the main object file
LDFLAGS     = -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static

# linker script used for the above linkier step
LD_SCRIPT   = eagle.app.v6.ld

ifneq ($(boot), none)
ifneq ($(app),0)
    LD_SCRIPT = eagle.app.v6.$(boot).$(flash).app$(app).ld
    BIN_NAME = user$(app).$(flash).$(boot)
endif
else
    app = 0
endif

# various paths from the SDK used in this project
SDK_LIBDIR  = lib
SDK_LDDIR   = ld
SDK_INCDIR  = include include/json

# 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
LD      := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc
OBJCOPY := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-objcopy
OBJDUMP := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-objdump

# no user configurable options below here
SRC_DIR     := $(MODULES)
BUILD_DIR   := $(addprefix $(BUILD_BASE)/,$(MODULES))

SDK_LIBDIR  := $(addprefix $(SDK_BASE)/,$(SDK_LIBDIR))
SDK_INCDIR  := $(addprefix -I$(SDK_BASE)/,$(SDK_INCDIR))

SRC     := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.c))
OBJ     := $(patsubst %.c,$(BUILD_BASE)/%.o,$(SRC))
LIBS        := $(addprefix -l,$(LIBS))
APP_AR      := $(addprefix $(BUILD_BASE)/,$(TARGET)_app.a)
TARGET_OUT  := $(addprefix $(BUILD_BASE)/,$(TARGET).out)

LD_SCRIPT   := $(addprefix -T$(SDK_BASE)/$(SDK_LDDIR)/,$(LD_SCRIPT))

INCDIR  := $(addprefix -I,$(SRC_DIR))
EXTRA_INCDIR    := $(addprefix -I,$(EXTRA_INCDIR))
MODULE_INCDIR   := $(addsuffix /include,$(INCDIR))

VERBOSE := 1
V ?= $(VERBOSE)
ifeq ("$(V)","1")
Q :=
vecho := @echo
else
Q := @
vecho := @echo
endif

vpath %.c $(SRC_DIR)

define compile-objects
$1/%.o: %.c
    $(vecho) "CC $$<"
    $(Q) $(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS)  -c $$< -o $$@
endef

.PHONY: all checkdirs clean flash flashinit flashonefile rebuild

all: checkdirs $(TARGET_OUT)

$(TARGET_OUT): $(APP_AR)
    $(vecho) "LD $@"
    $(Q) $(LD) -L$(SDK_LIBDIR) $(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@
    $(vecho) "------------------------------------------------------------------------------"
    $(vecho) "Section info:"
    $(Q) $(OBJDUMP) -h -j .data -j .rodata -j .bss -j .text -j .irom0.text $@
    $(vecho) "------------------------------------------------------------------------------"
    $(vecho) "Section info:"
    $(Q) $(SDK_TOOLS)/memanalyzer.exe $(OBJDUMP).exe $@
    $(vecho) "------------------------------------------------------------------------------"
    $(vecho) "Run objcopy, please wait..."
    $(Q) $(OBJCOPY) --only-section .text -O binary $@ eagle.app.v6.text.bin
    $(Q) $(OBJCOPY) --only-section .data -O binary $@ eagle.app.v6.data.bin
    $(Q) $(OBJCOPY) --only-section .rodata -O binary $@ eagle.app.v6.rodata.bin
    $(Q) $(OBJCOPY) --only-section .irom0.text -O binary $@ eagle.app.v6.irom0text.bin
    $(vecho) "objcopy done"
    $(vecho) "Run gen_appbin.exe"
ifeq ($(app), 0)
    $(Q) $(SDK_TOOLS)/gen_appbin.exe $@ 0 $(mode) $(freqdiv) $(size)
    $(Q) mv eagle.app.flash.bin $(FW_BASE)/eagle.flash.bin
    $(Q) mv eagle.app.v6.irom0text.bin $(FW_BASE)/eagle.irom0text.bin
    $(Q) rm eagle.app.v6.*
    $(vecho) "No boot needed."
    $(vecho) "Generate eagle.flash.bin and eagle.irom0text.bin successully in folder $(FW_BASE)."
    $(vecho) "eagle.flash.bin-------->0x00000"
    $(vecho) "eagle.irom0text.bin---->0x40000"
else
    ifeq ($(boot), new)
        $(Q) $(SDK_TOOLS)/gen_appbin.exe $@ 2 $(mode) $(freqdiv) $(size)
        $(vecho) "Support boot_v1.3 and +"
    else
        $(Q) $(SDK_TOOLS)/gen_appbin.exe $@ 1 $(mode) $(freqdiv) $(size)
        $(vecho) "Support boot_v1.1 and +"
    endif
    $(Q) mv eagle.app.flash.bin $(FW_BASE)/upgrade/$(BIN_NAME).bin
    $(Q) rm eagle.app.v6.*
    $(vecho) "Generate $(BIN_NAME).bin successully in folder $(FW_BASE)/upgrade."
    $(vecho) "boot_v1.x.bin------->0x00000"
    $(vecho) "$(BIN_NAME).bin--->$(addr)"
endif
    $(vecho) "Done"

$(APP_AR): $(OBJ)
    $(vecho) "AR $@"
    $(Q) $(AR) cru $@ $^

checkdirs: $(BUILD_DIR) $(FW_BASE)

$(BUILD_DIR):
    $(Q) mkdir -p $@

$(FW_BASE):
    $(Q) mkdir -p $@
    $(Q) mkdir -p $@/upgrade

flashonefile: all
    $(OBJCOPY) --only-section .text -O binary $(TARGET_OUT) eagle.app.v6.text.bin
    $(OBJCOPY) --only-section .data -O binary $(TARGET_OUT) eagle.app.v6.data.bin
    $(OBJCOPY) --only-section .rodata -O binary $(TARGET_OUT) eagle.app.v6.rodata.bin
    $(OBJCOPY) --only-section .irom0.text -O binary $(TARGET_OUT) eagle.app.v6.irom0text.bin
    $(SDK_TOOLS)/gen_appbin_old.exe $(TARGET_OUT) v6
    $(SDK_TOOLS)/gen_flashbin.exe eagle.app.v6.flash.bin eagle.app.v6.irom0text.bin 0x40000
    rm -f eagle.app.v6.data.bin
    rm -f eagle.app.v6.flash.bin
    rm -f eagle.app.v6.irom0text.bin
    rm -f eagle.app.v6.rodata.bin
    rm -f eagle.app.v6.text.bin
    rm -f eagle.app.sym
    mv eagle.app.flash.bin $(FW_BASE)/
    $(vecho) "No boot needed."
    $(vecho) "Generate eagle.app.flash.bin successully in folder $(FW_BASE)."
    $(vecho) "eagle.app.flash.bin-------->0x00000"
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash $(flashimageoptions) 0x00000 $(FW_BASE)/eagle.app.flash.bin

flashboot: all flashinit
ifeq ($(boot), new)
    $(vecho) "Flash boot_v1.3 and +"
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash $(flashimageoptions) 0x00000 $(SDK_BASE)/bin/boot_v1.3\(b3\).bin
endif
ifeq ($(boot), old)
    $(vecho) "Flash boot_v1.1 and +"
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash $(flashimageoptions) 0x00000 $(SDK_BASE)/bin/boot_v1.1.bin
endif
ifeq ($(boot), none)
    $(vecho) "No boot needed."
endif

flash: all
ifeq ($(app), 0) 
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash $(flashimageoptions) 0x00000 $(FW_BASE)/eagle.flash.bin 0x40000 $(FW_BASE)/eagle.irom0text.bin
else
ifeq ($(boot), none)
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash $(flashimageoptions) 0x00000 $(FW_BASE)/eagle.flash.bin 0x40000 $(FW_BASE)/eagle.irom0text.bin
else
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash $(flashimageoptions) $(addr) $(FW_BASE)/upgrade/$(BIN_NAME).bin
endif
endif

flashinit:
    $(vecho) "Flash init data:"
    $(vecho) "Clear old settings (EEP area):"
    $(vecho) "clear_eep.bin-------->0x79000"
    $(vecho) "Default config (Clear SDK settings):"
    $(vecho) "blank.bin-------->0x7E000"
    $(vecho) "esp_init_data_default.bin-------->0x7C000"
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash $(flashimageoptions) 0x79000 $(SDK_BASE)/bin/clear_eep.bin 0x7c000 $(SDK_BASE)/bin/esp_init_data_default.bin 0x7e000 $(SDK_BASE)/bin/blank.bin

rebuild: clean all

clean:
    $(Q) rm -f $(APP_AR)
    $(Q) rm -f $(TARGET_OUT)
    $(Q) rm -rf $(BUILD_DIR)
    $(Q) rm -rf $(BUILD_BASE)
    $(Q) rm -rf $(FW_BASE)

$(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir))))

# use wifi settings from environment or hard code them here
WIFI_SSID ?= dd-wrt
WIFI_PWD  ?= ESP8266@

ESPTOOL2     ?= $(SDK_TOOLS)/esptool2
FW_SECTS      = .text .data .rodata
FW_USER_ARGS  = -quiet -bin -boot2

otaall: $(OTA_BUILD_DIR) $(FW_BASE) $(FW_BASE)/rom0.bin $(FW_BASE)/rom1.bin

$(OTA_BUILD_DIR)/%.o: %.c %.h
    @echo "CC $<"
    @$(CC) -I. $(SDK_INCDIR) $(CFLAGS) -o $@ -c $<

$(OTA_BUILD_DIR)/%.elf: $(O_FILES)
    @echo "LD $(notdir $@)"
    @$(LD) -L$(SDK_LIBDIR) -T$(notdir $(basename $@)).ld $(LDFLAGS) -Wl,--start-group $(LIBS) $^ -Wl,--end-group -o $@

$(FW_BASE)/%.bin: $(OTA_BUILD_DIR)/%.elf
    @echo "FW $(notdir $@)"
    @$(ESPTOOL2) $(FW_USER_ARGS) $^ $@ $(FW_SECTS)

$(OTA_BUILD_DIR):
    @mkdir -p $@

But the result is:

16:49:55 **** Build of configuration Default for project TMS_ESP8266_OTA ****
mingw32-make.exe -f C:/Trabalho/TMS_ESP8266/branches/r48_ota/Makefile otaall 
mkdir -p firmware
mkdir -p firmware/upgrade
LD rom0.elf
C:\Espressif\ESP8266_SDK/lib\libmain.a(app_main.o): In function `user_uart_wait_tx_fifo_empty':
(.irom0.text+0x3b0): undefined reference to `user_init'
C:\Espressif\ESP8266_SDK/lib\libmain.a(app_main.o): In function `user_rf_pre_init':
(.irom0.text+0x5f4): undefined reference to `user_init'
collect2.exe: error: ld returned 1 exit status
mingw32-make.exe: *** [/rom0.elf] Error 1

Thank you. Best regards.

raburton commented 9 years ago

That Makefile is a huge mess, why not just use the one from the sample project. It'll work for most scenarios, and if it needs modifying it'll be a lot easier because it's much simpler.

fvpalha commented 9 years ago

Hi Richard.

Thank you by tip.

That is the Makefile from the sample project, it works in sample:

#
# Makefile for rBoot sample project
# https://github.com/raburton/esp8266
#

# use wifi settings from environment or hard code them here
WIFI_SSID ?= dd-wrt
WIFI_PWD  ?= ESP8266@

# Base directory for the compiler
XTENSA_TOOLS_ROOT ?= c:/Espressif/xtensa-lx106-elf/bin

#SDK_BASE   ?= /opt/esp-open-sdk/sdk
SDK_BASE    ?= c:/Espressif/ESP8266_SDK
SDK_LIBDIR  = lib
SDK_INCDIR  = include

ESPTOOL2     ?= ../esptool2/esptool2
FW_SECTS      = .text .data .rodata
FW_USER_ARGS  = -quiet -bin -boot2

#ifndef XTENSA_BINDIR
#CC := xtensa-lx106-elf-gcc
#LD := xtensa-lx106-elf-gcc
#else
#CC := $(addprefix $(XTENSA_BINDIR)/,xtensa-lx106-elf-gcc)
#LD := $(addprefix $(XTENSA_BINDIR)/,xtensa-lx106-elf-gcc)
#endif

# 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
LD  := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc

BUILD_DIR = build
FIRMW_DIR = firmware

SDK_LIBDIR := $(addprefix $(SDK_BASE)/,$(SDK_LIBDIR))
SDK_INCDIR := $(addprefix -I$(SDK_BASE)/,$(SDK_INCDIR))

LIBS    = c gcc hal phy net80211 lwip wpa main pp
CFLAGS  = -Os -g -O2 -Wpointer-arith -Wundef -Werror -Wno-implicit -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls  -mtext-section-literals  -D__ets__ -DICACHE_FLASH
LDFLAGS = -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static

SRC     := $(wildcard *.c)
OBJ     := $(patsubst %.c,$(BUILD_DIR)/%.o,$(SRC))
LIBS        := $(addprefix -l,$(LIBS))

ifneq ($(WIFI_SSID), "")
    CFLAGS += -DWIFI_SSID=\"$(WIFI_SSID)\"
endif
ifneq ($(WIFI_PWD), "")
    CFLAGS += -DWIFI_PWD=\"$(WIFI_PWD)\"
endif

.SECONDARY:
.PHONY: all clean

C_FILES = $(wildcard *.c)
O_FILES = $(patsubst %.c,$(BUILD_DIR)/%.o,$(C_FILES))

all: $(BUILD_DIR) $(FIRMW_DIR) $(FIRMW_DIR)/rom0.bin $(FIRMW_DIR)/rom1.bin

$(BUILD_DIR)/%.o: %.c %.h
    @echo "CC $<"
    @$(CC) -I. $(SDK_INCDIR) $(CFLAGS) -o $@ -c $<

$(BUILD_DIR)/%.elf: $(O_FILES)
    @echo "LD $(notdir $@)"
    @$(LD) -L$(SDK_LIBDIR) -T$(notdir $(basename $@)).ld $(LDFLAGS) -Wl,--start-group $(LIBS) $^ -Wl,--end-group -o $@

$(FIRMW_DIR)/%.bin: $(BUILD_DIR)/%.elf
    @echo "FW $(notdir $@)"
    @$(ESPTOOL2) $(FW_USER_ARGS) $^ $@ $(FW_SECTS)

$(BUILD_DIR):
    @mkdir -p $@

$(FIRMW_DIR):
    @mkdir -p $@

# esptool path and port
SDK_TOOLS   ?= c:/Espressif/utils
ESPTOOL     ?= $(SDK_TOOLS)/esptool.exe
ESPPORT     ?= COM1
ESPBAUD     ?= 115200
flash: all
    $(ESPTOOL) -p $(ESPPORT) -b $(ESPBAUD) write_flash -fs 8m 0x00000 $(FIRMW_DIR)/rboot.bin 0x02000 $(FIRMW_DIR)/rom0.bin 0x82000 $(FIRMW_DIR)/rom1.bin 0xfc000 $(FIRMW_DIR)/blank4.bin

clean:
    @echo "RM $(BUILD_DIR) $(FIRMW_DIR)"
    @rm -rf $(BUILD_DIR)
    @rm -rf $(FIRMW_DIR)

And the result is:

mingw32-make.exe -f C:/Trabalho/TMS_ESP8266/branches/r48_ota/Makefile all 
LD rom0.elf
C:\Espressif\ESP8266_SDK/lib\libmain.a(app_main.o): In function `user_uart_wait_tx_fifo_empty':
(.irom0.text+0x3b0): undefined reference to `user_init'
C:\Espressif\ESP8266_SDK/lib\libmain.a(app_main.o): In function `user_rf_pre_init':
(.irom0.text+0x5f4): undefined reference to `user_init'
collect2.exe: error: ld returned 1 exit status
mingw32-make.exe: *** [build/rom0.elf] Error 1
raburton commented 9 years ago

Looks like your code doesn't have a user_init function in it.

fvpalha commented 9 years ago

Hi Richard.

Congratulations by the great and much useful project.

I suggested to @cherts to add the rboot-sampleproject into Unofficial Development Kit for Espressif ESP8266.

To make easy add the FOTA resource in a new project based on others devkit examples, for newbies like me, it's necessary edit the Makefile.

Please, help me change the files/folders and the Makefile

Best regards.