j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove custom entry point, pending merge of esptool.py patch adding --entry-symbol option

Browse source
This commit is contained in:
Angus Gratton 2015-06-03 14:29:56 +10:00
parent 1ee7222509
commit a173ffa81d
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common.mk
View file

@ -67,7 +67,8 @@ SDK_LIBS ?= main net80211 phy pp wpa
# open source libraries linked in # open source libraries linked in
LIBS ?= gcc hal LIBS ?= gcc hal
ENTRY_SYMBOL ?= sdk_call_user_start # Note: this isn't overridable without a not-yet-merged patch to esptool
ENTRY_SYMBOL = call_user_start
CFLAGS = -Wall -Werror -Wl,-EL -nostdlib -mlongcalls -mtext-section-literals -std=gnu99 CFLAGS = -Wall -Werror -Wl,-EL -nostdlib -mlongcalls -mtext-section-literals -std=gnu99
LDFLAGS = -nostdlib -Wl,--no-check-sections -Wl,-L$(BUILD_DIR)sdklib -Wl,-L$(ROOT)lib -u $(ENTRY_SYMBOL) -Wl,-static -Wl,-Map=build/${TARGET}.map LDFLAGS = -nostdlib -Wl,--no-check-sections -Wl,-L$(BUILD_DIR)sdklib -Wl,-L$(ROOT)lib -u $(ENTRY_SYMBOL) -Wl,-static -Wl,-Map=build/${TARGET}.map
@ -220,7 +221,7 @@ $(BUILD_DIR) $(FW_BASE) $(BUILD_DIR)sdklib:
$(FW_FILE_1) $(FW_FILE_2): $(TARGET_OUT) $(FW_BASE) $(FW_FILE_1) $(FW_FILE_2): $(TARGET_OUT) $(FW_BASE)
$(vecho) "FW $@" $(vecho) "FW $@"
$(ESPTOOL) elf2image --entry-symbol $(ENTRY_SYMBOL) $< -o $(FW_BASE) $(ESPTOOL) elf2image $< -o $(FW_BASE)
flash: $(FW_FILE_1) $(FW_FILE_2) flash: $(FW_FILE_1) $(FW_FILE_2)
$(ESPTOOL) -p $(ESPPORT) --baud $(ESPBAUD) write_flash $(FW_1) $(FW_FILE_1) $(FW_2) $(FW_FILE_2) $(ESPTOOL) -p $(ESPPORT) --baud $(ESPBAUD) write_flash $(FW_1) $(FW_FILE_1) $(FW_2) $(FW_FILE_2)

2
ld/eagle.app.v6.ld
View file

@ -23,7 +23,7 @@ PHDRS
/* Default entry point: */ /* Default entry point: */
ENTRY(sdk_call_user_start) ENTRY(call_user_start)
EXTERN(sdk__DebugExceptionVector) EXTERN(sdk__DebugExceptionVector)
EXTERN(sdk__DoubleExceptionVector) EXTERN(sdk__DoubleExceptionVector)
EXTERN(sdk__KernelExceptionVector) EXTERN(sdk__KernelExceptionVector)

2
lib/symbols_norename.txt
View file

@ -1,3 +1,5 @@
# stop-gap until esptool.py patch for configurable entry point is merged
call_user_start
# this is a stop-gap to avoid renaming some useful libc # this is a stop-gap to avoid renaming some useful libc
# symbols to sdk_xxx # symbols to sdk_xxx
puts puts