Skip to content

Commit 8e1ba51

Browse files
committed
Add the building of esptool to the release makefile and modify the paths to use ./esptool to execute the version in the release folder.
1 parent 0a2bc3c commit 8e1ba51

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

release/Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ release/Parallax-ESP.ota \
1010
release/blank.bin \
1111
release/esp_init_data_default_v08.bin
1212

13+
TOOLS=\
14+
release/esptool
15+
1316
BOOTBIN=boot_v1.7.bin
1417
IMAGES+=release/$(BOOTBIN)
1518

@@ -27,7 +30,10 @@ build:
2730
$(MAKE) -C .. STA_SSID= STA_PASS= clean
2831
$(MAKE) -C .. STA_SSID= STA_PASS=
2932

30-
staged-files: release release/release-notes.txt $(IMAGES)
33+
../esptool-ck/esptool:
34+
$(MAKE) -C ../esptool-ck
35+
36+
staged-files: release release/release-notes.txt $(IMAGES) $(TOOLS)
3137
$(CP) flash-all.sh update-fw.sh clear.sh clear-ffs.sh release
3238

3339
release/release-notes.txt: release-notes.txt
@@ -48,11 +54,14 @@ release/blank.bin: $(SDK)/bin/blank.bin
4854
release/esp_init_data_default_v08.bin: $(SDK)/bin/esp_init_data_default_v08.bin
4955
$(CP) $< $@
5056

57+
release/esptool: ../esptool-ck/esptool
58+
$(CP) $< $@
59+
5160
release:
5261
mkdir -p release
5362

5463
patch: patch.c
5564
cc -o $@ $<
5665

5766
clean:
58-
rm -rf release patch esp-httpd.zip
67+
rm -rf release patch ../esptool-ck/esptool

release/clear-1m.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ WIFI_SETTINGS3=0x0FA000
3030
#flash filesystem base
3131
FFS_BASE=0x100000
3232

33-
esptool \
33+
./esptool \
3434
-cp $PORT \
3535
-cd $BOARD \
3636
-cb $BAUD \

release/clear-ffs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FLASH_INTERFACE=qio
1717
#flash filesystem base
1818
FFS_BASE=0x100000
1919

20-
esptool \
20+
./esptool \
2121
-cp $PORT \
2222
-cd $BOARD \
2323
-cb $BAUD \

release/clear.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737
#flash filesystem base
3838
FFS_BASE=0x100000
3939

40-
esptool \
40+
./esptool \
4141
-cp $PORT \
4242
-cd $BOARD \
4343
-cb $BAUD \

release/flash-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fi
4141
#flash filesystem base
4242
FFS_BASE=0x100000
4343

44-
esptool \
44+
./esptool \
4545
-cp $PORT \
4646
-cd $BOARD \
4747
-cb $BAUD \

release/update-fw.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FLASH_INTERFACE=qio
1717
BOOT_LOADER=0x000000
1818
USER1_IMAGE=0x001000
1919

20-
esptool \
20+
./esptool \
2121
-cp $PORT \
2222
-cd $BOARD \
2323
-cb $BAUD \

0 commit comments

Comments
 (0)