Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit cbff15d

Browse files
geza-pycomgeza-pycom
committed
Update makefiles and scripts
1 parent 1b57396 commit cbff15d

24 files changed

+203
-25
lines changed

‎esp32/application.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -937,16 +937,16 @@ endif #ifeq ($(TARGET), $(filter $(TARGET), app boot_app))
937937

938938
release: $(APP_BIN) $(BOOT_BIN)
939939
$(ECHO) "checking size of image"
940-
$(Q) bash tools/size_check.sh $(BOARD) $(BTYPE) $(VARIANT)
940+
$(Q) bash tools/size_check.sh $(BOARD) $(BTYPE) $(VARIANT) $(SMALL_FACTORY_FW_ENABLED)
941941
ifeq ($(SECURE), on)
942-
$(Q) tools/makepkg.sh $(BOARD) $(RELEASE_DIR) $(BUILD) 1
942+
$(Q) tools/makepkg.sh $(BOARD) $(RELEASE_DIR) $(BUILD) 1 $(SMALL_FACTORY_FW_ENABLED)
943943
else
944-
$(Q) tools/makepkg.sh $(BOARD) $(RELEASE_DIR) $(BUILD)
944+
$(Q) tools/makepkg.sh $(BOARD) $(RELEASE_DIR) $(BUILD) 0 $(SMALL_FACTORY_FW_ENABLED)
945945
endif
946946

947947
flash: release
948948
$(ECHO) "checking size of image"
949-
$(Q) bash tools/size_check.sh $(BOARD) $(BTYPE) $(VARIANT)
949+
$(Q) bash tools/size_check.sh $(BOARD) $(BTYPE) $(VARIANT) $(SMALL_FACTORY_FW_ENABLED)
950950

951951
$(ECHO) "Flashing project"
952952
ifeq ($(SECURE), on)

‎esp32/boards/FIPY/script_8MB_normal_factory_fw

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0x1EF000"],
5+
"ota_0" : ["0x210000", "0x1EF000"],
6+
"otadata" : ["0x1FF000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "bootloader", "bootloader.bin"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin"],
11+
["w", "factory", "fipy.bin"]
12+
]
13+
}

‎esp32/boards/FIPY/script_8MB_enc renamed to ‎esp32/boards/FIPY/script_8MB_normal_factory_fw_enc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10-
["w", "partitions", "partitions_8MB.bin_enc"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin_enc"],
1111
["w", "factory", "fipy.bin_enc"]
1212
]
1313
}

‎esp32/boards/FIPY/script_8MB renamed to ‎esp32/boards/FIPY/script_8MB_small_factory_fw

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "bootloader", "bootloader.bin"],
10-
["w", "partitions", "partitions_8MB.bin"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin"],
1111
["w", "factory", "factory_fw.bin"],
1212
["w", "ota_0", "fipy.bin"]
1313
]

‎esp32/boards/FIPY/script_8MB_small_factory_fw_enc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0xFF000"],
5+
"ota_0" : ["0x110000", "0x2EF000"],
6+
"otadata" : ["0x10F000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin_enc"],
11+
["w", "factory", "factory_fw.bin"],
12+
["w", "ota_0", "fipy.bin"]
13+
]
14+
}

‎esp32/boards/GPY/script_8MB _normal_factory_fw

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0x1EF000"],
5+
"ota_0" : ["0x210000", "0x1EF000"],
6+
"otadata" : ["0x1FF000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "bootloader", "bootloader.bin"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin"],
11+
["w", "factory", "gpy.bin"]
12+
]
13+
}

‎esp32/boards/GPY/script_8MB_enc renamed to ‎esp32/boards/GPY/script_8MB_normal_factory_fw_enc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10-
["w", "partitions", "partitions_8MB.bin_enc"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin_enc"],
1111
["w", "factory", "gpy.bin_enc"]
1212
]
1313
}

‎esp32/boards/GPY/script_8MB renamed to ‎esp32/boards/GPY/script_8MB_small_factory_fw

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "bootloader", "bootloader.bin"],
10-
["w", "partitions", "partitions_8MB.bin"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin"],
1111
["w", "factory", "factory_fw.bin"],
1212
["w", "ota_0", "gpy.bin"]
1313
]

‎esp32/boards/GPY/script_8MB_small_factory_fw_enc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0xFF000"],
5+
"ota_0" : ["0x110000", "0x2EF000"],
6+
"otadata" : ["0x10F000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin_enc"],
11+
["w", "factory", "factory_fw.bin"],
12+
["w", "ota_0", "gpy.bin"]
13+
]
14+
}

‎esp32/boards/LOPY/script_8MB_normal_factory_fw

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0x1EF000"],
5+
"ota_0" : ["0x210000", "0x1EF000"],
6+
"otadata" : ["0x1FF000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "bootloader", "bootloader.bin"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin"],
11+
["w", "factory", "lopy.bin"]
12+
]
13+
}

‎esp32/boards/LOPY/script_8MB_enc renamed to ‎esp32/boards/LOPY/script_8MB_normal_factory_fw_enc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10-
["w", "partitions", "partitions_8MB.bin_enc"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin_enc"],
1111
["w", "factory", "lopy.bin_enc"]
1212
]
1313
}

‎esp32/boards/LOPY/script_8MB renamed to ‎esp32/boards/LOPY/script_8MB_small_factory_fw

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "bootloader", "bootloader.bin"],
10-
["w", "partitions", "partitions_8MB.bin"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin"],
1111
["w", "factory", "factory_fw.bin"],
1212
["w", "ota_0", "lopy.bin"]
1313
]

‎esp32/boards/LOPY/script_8MB_small_factory_fw_enc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0xFF000"],
5+
"ota_0" : ["0x110000", "0x2EF000"],
6+
"otadata" : ["0x10F000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin_enc"],
11+
["w", "factory", "factory_fw.bin"],
12+
["w", "ota_0", "lopy.bin"]
13+
]
14+
}

‎esp32/boards/LOPY4/script_8MB_normal_factory_fw

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0x1EF000"],
5+
"ota_0" : ["0x210000", "0x1EF000"],
6+
"otadata" : ["0x1FF000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "bootloader", "bootloader.bin"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin"],
11+
["w", "factory", "lopy4.bin"]
12+
]
13+
}

‎esp32/boards/LOPY4/script_8MB_enc renamed to ‎esp32/boards/LOPY4/script_8MB_normal_factory_fw_enc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10-
["w", "partitions", "partitions_8MB.bin_enc"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin_enc"],
1111
["w", "factory", "lopy4.bin_enc"]
1212
]
1313
}

‎esp32/boards/LOPY4/script_8MB renamed to ‎esp32/boards/LOPY4/script_8MB_small_factory_fw

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "bootloader", "bootloader.bin"],
10-
["w", "partitions", "partitions_8MB.bin"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin"],
1111
["w", "factory", "factory_fw.bin"],
1212
["w", "ota_0", "lopy4.bin"]
1313
]

‎esp32/boards/LOPY4/script_8MB_small_factory_fw_enc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0xFF000"],
5+
"ota_0" : ["0x110000", "0x2EF000"],
6+
"otadata" : ["0x10F000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin_enc"],
11+
["w", "factory", "factory_fw.bin"],
12+
["w", "ota_0", "lopy4.bin"]
13+
]
14+
}

‎esp32/boards/WIPY/script_8MB_normal_factory_fw

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0x1EF000"],
5+
"ota_0" : ["0x210000", "0x1EF000"],
6+
"otadata" : ["0x1FF000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "bootloader", "bootloader.bin"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin"],
11+
["w", "factory", "wipy.bin"]
12+
]
13+
}

‎esp32/boards/WIPY/script_8MB_enc renamed to ‎esp32/boards/WIPY/script_8MB_normal_factory_fw_enc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10-
["w", "partitions", "partitions_8MB.bin_enc"],
10+
["w", "partitions", "partitions_8MB_normal_factory_fw.bin_enc"],
1111
["w", "factory", "wipy.bin_enc"]
1212
]
1313
}

‎esp32/boards/WIPY/script_8MB renamed to ‎esp32/boards/WIPY/script_8MB_small_factory_fw

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"script" : [
99
["w", "bootloader", "bootloader.bin"],
10-
["w", "partitions", "partitions_8MB.bin"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin"],
1111
["w", "factory", "factory_fw.bin"],
1212
["w", "ota_0", "wipy.bin"]
1313
]

‎esp32/boards/WIPY/script_8MB_small_factory_fw_enc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version" : "2.1",
3+
"partitions" : {
4+
"factory" : ["0x10000", "0xFF000"],
5+
"ota_0" : ["0x110000", "0x2EF000"],
6+
"otadata" : ["0x10F000", "0x1000"]
7+
},
8+
"script" : [
9+
["w", "secureboot", "bootloader-reflash-digest.bin_enc"],
10+
["w", "partitions", "partitions_8MB_small_factory_fw.bin_enc"],
11+
["w", "factory", "factory_fw.bin"],
12+
["w", "ota_0", "wipy.bin"]
13+
]
14+
}

‎esp32/ftp/updater.c

+10
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@
3434
static const char *TAG = "updater";
3535
#define UPDATER_IMG_PATH "/flash/sys/appimg.bin"
3636

37+
#if(SMALL_FACTORY_FW_ENABLED == 1)
38+
#define IMG_SIZE_8MB (3004 * 1024)
39+
#define IMG_UPDATE1_OFFSET_8MB (1088 * 1024) // taken from the partitions table
40+
#else
41+
#define IMG_SIZE_8MB (1980 * 1024)
42+
#define IMG_UPDATE1_OFFSET_8MB (2112 * 1024) // taken from the partitions table
43+
#endif
44+
#define IMG_SIZE_4MB (2424 * 1024)
45+
#define IMG_UPDATE1_OFFSET_4MB (1088 * 1024) // taken from the partitions table
46+
3747
/* if flash is encrypted, it requires the flash_write operation to be done in 16 Bytes chunks */
3848
#define ENCRYP_FLASH_MIN_CHUNK 16
3949

‎esp32/tools/makepkg.sh

+39-10
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,30 @@ BOARD=$(echo $1)
1010

1111
FACTORY_BIN_DIR="$(pwd)/factory_fw/binary"
1212

13-
if [ $4 ]; then
13+
14+
if [ $5 -eq 1 ]; then
15+
PART_FILE_8MB='partitions_8MB_small_factory_fw.bin_enc'
16+
SCRIPT_FILE_8MB='script_8MB_small_factory_fw_enc'
17+
else
18+
PART_FILE_8MB='partitions_8MB_normal_factory_fw.bin_enc'
19+
SCRIPT_FILE_8MB='script_8MB_normal_factory_fw_enc'
20+
21+
fi
22+
23+
if [ $4 -eq 1 ]; then
1424
SCRIPT_NAME_4MB="script_4MB_enc"
15-
SCRIPT_NAME_8MB="script_8MB_enc"
25+
if [ $5 -eq 1 ]; then
26+
SCRIPT_NAME_8MB="script_8MB_small_factory_fw_enc"
27+
else
28+
SCRIPT_NAME_8MB='script_8MB_normal_factory_fw_enc'
29+
fi
1630
else
1731
SCRIPT_NAME_4MB="script_4MB"
18-
SCRIPT_NAME_8MB="script_8MB"
32+
if [ $5 -eq 1 ]; then
33+
SCRIPT_NAME_8MB='script_8MB_small_factory_fw'
34+
else
35+
SCRIPT_NAME_8MB='script_8MB_normal_factory_fw'
36+
fi
1937
fi
2038
if [ -z $1 ]; then echo >&2 "Invalid board name!"; exit 1; fi
2139
if ! [ $0 = "tools/makepkg.sh" ]; then echo >&2 "Need to run as tools/makepkg.sh!"; exit 1; fi
@@ -53,8 +71,8 @@ PART_FILE_4MB=''
5371
PART_FILE_8MB=''
5472
SCRIPT_FILE_4MB=''
5573
SCRIPT_FILE_8MB=''
56-
57-
if [ $4 ]; then
74+
75+
if [ $4 -eq 1 ]; then
5876
BOOT_FILE='bootloader-reflash-digest.bin_enc'
5977
APP_FILE="${BOARD_NAME_L}.bin_enc"
6078
FILE_NAME="${BOARD_NAME}-${VERSION}_ENC.tar.gz"
@@ -68,12 +86,23 @@ fi
6886
cp ${BUILD_DIR}/bootloader/${BOOT_FILE} ${PKG_TMP_DIR}
6987
cp ${BUILD_DIR}/${APP_FILE} ${PKG_TMP_DIR}
7088

71-
if [ $4 ]; then
72-
PART_FILE_8MB='partitions_8MB.bin_enc'
73-
SCRIPT_FILE_8MB='script_8MB_enc'
89+
if [ $4 -eq 1 ]; then
90+
if [ $5 -eq 1 ]; then
91+
PART_FILE_8MB='partitions_8MB_small_factory_fw.bin_enc'
92+
SCRIPT_FILE_8MB='script_8MB_small_factory_fw_enc'
93+
else
94+
PART_FILE_8MB='partitions_8MB_normal_factory_fw.bin_enc'
95+
SCRIPT_FILE_8MB='script_8MB_normal_factory_fw_enc'
96+
97+
fi
7498
else
75-
PART_FILE_8MB='partitions_8MB.bin'
76-
SCRIPT_FILE_8MB='script_8MB'
99+
if [ $5 -eq 1 ]; then
100+
PART_FILE_8MB='partitions_8MB_small_factory_fw.bin'
101+
SCRIPT_FILE_8MB='script_8MB_small_factory_fw'
102+
else
103+
PART_FILE_8MB='partitions_8MB_normal_factory_fw.bin'
104+
SCRIPT_FILE_8MB='script_8MB_normal_factory_fw'
105+
fi
77106
fi
78107

79108
cp ${BUILD_DIR}/lib/${PART_FILE_8MB} ${PKG_TMP_DIR}

‎esp32/tools/size_check.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ else
1111
BUILD_DIR="build"
1212
fi
1313

14-
IMG_MAX_SIZE_8MB=3076096
14+
if [ $4 -eq 1 ]; then
15+
IMG_MAX_SIZE_8MB=3076096
16+
else
17+
IMG_MAX_SIZE_8MB=2027520
18+
fi
1519
IMG_MAX_SIZE_4MB=1761280
1620
OS="$(uname)"
1721

0 commit comments

Comments
 (0)