archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

alter ESP32 build to produce binaries with the same names as other builds

Browse Source
This commit is contained in:
Gordon Williams 2017-04-19 09:03:50 +01:00
parent 785c32ad6a
commit b302de426d
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/ESP32.py
View File

@ -20,7 +20,7 @@ info = {
'default_console' : "EV_SERIAL1",
'default_console_baudrate' : "115200",
'variables' : 5000,
'binary_name' : 'espruino_%v_esp32',
'binary_name' : 'espruino_%v_esp32.bin',
'build' : {
'optimizeflags' : '-Og',
'libraries' : [

16
make/targets/ESP32.make
View File

@ -1,26 +1,26 @@
ESP_ZIP = $(PROJ_NAME).tgz
espruino_esp32.bin: $(OBJS)
$(LD) $(LDFLAGS) -o espruino_esp32.elf -Wl,--start-group $(LIBS) $(OBJS) -Wl,--end-group
$(PROJ_NAME).bin: $(OBJS)
$(LD) $(LDFLAGS) -o $(PROJ_NAME).elf -Wl,--start-group $(LIBS) $(OBJS) -Wl,--end-group
python $(ESP_IDF_PATH)/components/esptool_py/esptool/esptool.py \
--chip esp32 \
elf2image \
--flash_mode "dio" \
--flash_freq "40m" \
-o espruino_esp32.bin \
espruino_esp32.elf
-o $(PROJ_NAME).bin \
$(PROJ_NAME).elf
$(ESP_ZIP): espruino_esp32.bin
$(ESP_ZIP): $(PROJ_NAME).bin
$(Q)rm -rf build/$(basename $(ESP_ZIP))
$(Q)mkdir -p build/$(basename $(ESP_ZIP))
$(Q)cp $(ESP_APP_TEMPLATE_PATH)/build/bootloader/bootloader.bin \
espruino_esp32.bin \
$(PROJ_NAME).bin \
$(ESP_APP_TEMPLATE_PATH)/build/partitions_espruino.bin \
targets/esp32/README_flash.txt \
build/$(basename $(ESP_ZIP))
$(Q)tar -C build -zcf $(ESP_ZIP) ./$(basename $(ESP_ZIP))
proj: espruino_esp32.bin $(ESP_ZIP)
proj: $(PROJ_NAME).bin $(ESP_ZIP)
flash:
python $(ESP_IDF_PATH)/components/esptool_py/esptool/esptool.py \
@ -32,7 +32,7 @@ flash:
--flash_mode "dio" \
--flash_freq "40m" \
0x1000 $(ESP_APP_TEMPLATE_PATH)/build/bootloader/bootloader.bin \
0x10000 espruino_esp32.bin \
0x10000 $(PROJ_NAME).bin \
0x8000 $(ESP_APP_TEMPLATE_PATH)/build/partitions_espruino.bin
erase_flash:

9
scripts/create_zip.sh
View File

@ -27,12 +27,18 @@ mkdir $ZIPDIR
# ESP8266
export ESP8266_SDK_ROOT=$DIR/esp_iot_sdk_v2.0.0.p1
export PATH=$PATH:$DIR/xtensa-lx106-elf/bin/
# ESP32
export ESP_IDF_PATH=$DIR/esp-idf
export ESP_APP_TEMPLATE_PATH=$DIR/app
export PATH=$PATH:$DIR/xtensa-esp32-elf/bin/
echo ------------------------------------------------------
echo Building Version $VERSION
echo ------------------------------------------------------
for BOARDNAME in PICO_1V3_CC3000 PICO_1V3_WIZ ESPRUINO_1V3 ESPRUINO_1V3_WIZ ESPRUINOWIFI PUCKJS NUCLEOF401RE NUCLEOF411RE STM32VLDISCOVERY STM32F3DISCOVERY STM32F4DISCOVERY OLIMEXINO_STM32 HYSTM32_24 HYSTM32_28 HYSTM32_32 RASPBERRYPI MICROBIT ESP8266_BOARD RUUVITAG
for BOARDNAME in PICO_1V3_CC3000 PICO_1V3_WIZ ESPRUINO_1V3 ESPRUINO_1V3_WIZ ESPRUINOWIFI PUCKJS NUCLEOF401RE NUCLEOF411RE STM32VLDISCOVERY STM32F3DISCOVERY STM32F4DISCOVERY OLIMEXINO_STM32 HYSTM32_24 HYSTM32_28 HYSTM32_32 RASPBERRYPI MICROBIT ESP8266_BOARD RUUVITAG ESP32
do
echo ------------------------------
echo $BOARDNAME
@ -69,6 +75,7 @@ do
ESP_BINARY_NAME=`basename $ESP_BINARY_NAME .hex`.zip
EXTRADEFS=DFU_UPDATE_BUILD=1
fi
echo "Building $ESP_BINARY_NAME"
echo
rm -f $BINARY_NAME