Skip to content

Commit 7824323

Browse files
author
Espressif Systems
committed
sync codes from non-os version 1.1.0, this is BBP initial version, os version 1.0.0!
***internal version b8a2c0c3***
1 parent 65d34be commit 7824323

27 files changed

+595
-113
lines changed

‎Makefile

+84-44
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BOOT?=none
2424
APP?=0
2525
SPI_SPEED?=40
2626
SPI_MODE?=QIO
27-
SPI_SIZE?=512
27+
SPI_SIZE_MAP?=0
2828

2929
ifeq ($(BOOT), new)
3030
boot = new
@@ -75,56 +75,87 @@ else
7575
endif
7676
endif
7777

78-
# flash larger than 1024KB only use 1024KB to storage user1.bin and user2.bin
79-
ifeq ($(SPI_SIZE), 256)
80-
size = 1
81-
flash = 256
82-
else
83-
ifeq ($(SPI_SIZE), 1024)
84-
size = 2
85-
flash = 1024
86-
else
87-
ifeq ($(SPI_SIZE), 2048)
88-
size = 3
89-
flash = 1024
90-
else
91-
ifeq ($(SPI_SIZE), 4096)
92-
size = 4
93-
flash = 1024
94-
else
95-
size = 0
96-
flash = 512
97-
endif
98-
endif
99-
endif
100-
endif
78+
addr = 0x01000
10179

102-
ifeq ($(flash), 512)
103-
ifeq ($(app), 1)
104-
addr = 0x01000
105-
else
80+
ifeq ($(SPI_SIZE_MAP), 1)
81+
size_map = 1
82+
flash = 256
83+
else
84+
ifeq ($(SPI_SIZE_MAP), 2)
85+
size_map = 2
86+
flash = 1024
10687
ifeq ($(app), 2)
107-
addr = 0x41000
88+
addr = 0x81000
10889
endif
109-
endif
110-
else
111-
ifeq ($(flash), 1024)
112-
ifeq ($(app), 1)
113-
addr = 0x01000
114-
else
90+
else
91+
ifeq ($(SPI_SIZE_MAP), 3)
92+
size_map = 3
93+
flash = 2048
11594
ifeq ($(app), 2)
11695
addr = 0x81000
11796
endif
97+
else
98+
ifeq ($(SPI_SIZE_MAP), 4)
99+
size_map = 4
100+
flash = 4096
101+
ifeq ($(app), 2)
102+
addr = 0x81000
103+
endif
104+
else
105+
ifeq ($(SPI_SIZE_MAP), 5)
106+
size_map = 5
107+
flash = 2048
108+
ifeq ($(app), 2)
109+
addr = 0x101000
110+
endif
111+
else
112+
ifeq ($(SPI_SIZE_MAP), 6)
113+
size_map = 6
114+
flash = 4096
115+
ifeq ($(app), 2)
116+
addr = 0x101000
117+
endif
118+
else
119+
size_map = 0
120+
flash = 512
121+
ifeq ($(app), 2)
122+
addr = 0x41000
123+
endif
124+
endif
125+
endif
126+
endif
118127
endif
119128
endif
120129
endif
121-
130+
122131
LD_FILE = $(LDDIR)/eagle.app.v6.ld
123132

124133
ifneq ($(boot), none)
125134
ifneq ($(app),0)
126-
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).$(flash).app$(app).ld
127-
BIN_NAME = user$(app).$(flash).$(boot)
135+
ifeq ($(size_map), 6)
136+
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).2048.ld
137+
else
138+
ifeq ($(size_map), 5)
139+
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).2048.ld
140+
else
141+
ifeq ($(size_map), 4)
142+
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).1024.app$(app).ld
143+
else
144+
ifeq ($(size_map), 3)
145+
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).1024.app$(app).ld
146+
else
147+
ifeq ($(size_map), 2)
148+
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).1024.app$(app).ld
149+
else
150+
ifeq ($(size_map), 0)
151+
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).512.app$(app).ld
152+
endif
153+
endif
154+
endif
155+
endif
156+
endif
157+
endif
158+
BIN_NAME = user$(app).$(flash).$(boot).$(size_map)
128159
endif
129160
else
130161
app = 0
@@ -221,7 +252,7 @@ endif
221252
@echo "!!!"
222253

223254
ifeq ($(app), 0)
224-
@python ../tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size)
255+
@python ../tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map)
225256
@mv eagle.app.flash.bin ../bin/eagle.flash.bin
226257
@mv eagle.app.v6.irom0text.bin ../bin/eagle.irom0text.bin
227258
@rm eagle.app.v6.*
@@ -230,12 +261,21 @@ ifeq ($(app), 0)
230261
@echo "eagle.flash.bin-------->0x00000"
231262
@echo "eagle.irom0text.bin---->0x40000"
232263
else
233-
ifeq ($(boot), new)
234-
@python ../tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size)
235-
@echo "Support boot_v1.2 and +"
236-
else
237-
@python ../tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size)
264+
ifneq ($(boot), new)
265+
@python ../tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map)
238266
@echo "Support boot_v1.1 and +"
267+
else
268+
@python ../tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map)
269+
270+
ifeq ($(size_map), 6)
271+
@echo "Support boot_v1.4 and +"
272+
else
273+
ifeq ($(size_map), 5)
274+
@echo "Support boot_v1.4 and +"
275+
else
276+
@echo "Support boot_v1.2 and +"
277+
endif
278+
endif
239279
endif
240280

241281
@mv eagle.app.flash.bin ../bin/upgrade/$(BIN_NAME).bin

‎app/gen_misc.bat

+43-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
@echo off
22

3+
echo gen_misc.bat version 20150511
4+
echo .
5+
36
echo Please follow below steps(1-5) to generate specific bin(s):
47
echo STEP 1: choose boot version(0=boot_v1.1, 1=boot_v1.2+, 2=none)
58
set input=default
@@ -90,32 +93,55 @@ if %input% equ 3 (
9093
echo spi mode: %spi_mode%
9194
echo.
9295

93-
echo STEP 5: choose spi size(0=256KB, 1=512KB, 2=1024KB, 3=2048KB, 4=4096KB)
96+
echo STEP 5: choose flash size and map
97+
echo 0= 512KB( 256KB+ 256KB)
98+
echo 2=1024KB( 512KB+ 512KB)
99+
echo 3=2048KB( 512KB+ 512KB)
100+
echo 4=4096KB( 512KB+ 512KB)
101+
echo 5=2048KB(1024KB+1024KB)
102+
echo 6=4096KB(1024KB+1024KB)
94103
set input=default
95-
set /p input=enter (0/1/2/3/4, default 1):
104+
set /p input=enter (0/1/2/3/4/5/6, default 0):
96105

97-
if %input% equ 0 (
98-
set spi_size=256
99-
) else (
100106
if %input% equ 2 (
101-
set spi_size=1024
102-
) else (
103-
if %input% equ 3 (
104-
set spi_size=2048
107+
set spi_size_map=2
108+
echo spi size: 1024KB
109+
echo spi ota map: 512KB + 512KB
105110
) else (
106-
if %input% equ 4 (
107-
set spi_size=4096
108-
) else (
109-
set spi_size=512
110-
))))
111-
112-
echo spi size: %spi_size% KB
111+
if %input% equ 3 (
112+
set spi_size_map=3
113+
echo spi size: 2048KB
114+
echo spi ota map: 512KB + 512KB
115+
) else (
116+
if %input% equ 4 (
117+
set spi_size_map=4
118+
echo spi size: 4096KB
119+
echo spi ota map: 512KB + 512KB
120+
) else (
121+
if %input% equ 5 (
122+
set spi_size_map=5
123+
echo spi size: 2048KB
124+
echo spi ota map: 1024KB + 1024KB
125+
) else (
126+
if %input% equ 6 (
127+
set spi_size_map=6
128+
echo spi size: 4096KB
129+
echo spi ota map: 1024KB + 1024KB
130+
) else (
131+
set spi_size_map=0
132+
echo spi size: 512KB
133+
echo spi ota map: 256KB + 256KB
134+
)
135+
)
136+
)
137+
)
138+
)
113139

114140
touch user/user_main.c
115141

116142
echo.
117143
echo start...
118144
echo.
119145

120-
make BOOT=%boot% APP=%app% SPI_SPEED=%spi_speed% SPI_MODE=%spi_mode% SPI_SIZE=%spi_size%
146+
make BOOT=%boot% APP=%app% SPI_SPEED=%spi_speed% SPI_MODE=%spi_mode% SPI_SIZE=%spi_size_map%
121147

‎app/gen_misc.sh

+35-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
22

3+
echo "gen_misc.sh version 20150511"
4+
echo ""
5+
36
echo "Please follow below steps(1-5) to generate specific bin(s):"
47
echo "STEP 1: choose boot version(0=boot_v1.1, 1=boot_v1.2+, 2=none)"
58
echo "enter(0/1/2, default 2):"
@@ -96,25 +99,46 @@ fi
9699
echo "spi mode: $spi_mode"
97100
echo ""
98101

99-
echo "STEP 5: choose spi size(0=256KB, 1=512KB, 2=1024KB, 3=2048KB, 4=4096KB)"
100-
echo "enter (0/1/2/3/4, default 1):"
102+
echo "STEP 5: choose spi size and map"
103+
echo " 0= 512KB( 256KB+ 256KB)"
104+
echo " 2=1024KB( 512KB+ 512KB)"
105+
echo " 3=2048KB( 512KB+ 512KB)"
106+
echo " 4=4096KB( 512KB+ 512KB)"
107+
echo " 5=2048KB(1024KB+1024KB)"
108+
echo " 6=4096KB(1024KB+1024KB)"
109+
echo "enter (0/2/3/4/5/6, default 0):"
101110
read input
102111

103112
if [ -z "$input" ]; then
104-
spi_size=512
105-
elif [ $input == 0 ]; then
106-
spi_size=256
113+
spi_size_map=0
114+
echo "spi size: 512KB"
115+
echo "spi ota map: 256KB + 256KB"
107116
elif [ $input == 2 ]; then
108-
spi_size=1024
117+
spi_size_map=2
118+
echo "spi size: 1024KB"
119+
echo "spi ota map: 512KB + 512KB"
109120
elif [ $input == 3 ]; then
110-
spi_size=2048
121+
spi_size_map=3
122+
echo "spi size: 2048KB"
123+
echo "spi ota map: 512KB + 512KB"
111124
elif [ $input == 4 ]; then
112-
spi_size=4096
125+
spi_size_map=4
126+
echo "spi size: 4096KB"
127+
echo "spi ota map: 512KB + 512KB"
128+
elif [ $input == 5 ]; then
129+
spi_size_map=5
130+
echo "spi size: 2048KB"
131+
echo "spi ota map: 1024KB + 1024KB"
132+
elif [ $input == 6 ]; then
133+
spi_size_map=6
134+
echo "spi size: 4096KB"
135+
echo "spi ota map: 1024KB + 1024KB"
113136
else
114-
spi_size=512
137+
spi_size_map=0
138+
echo "spi size: 512KB"
139+
echo "spi ota map: 256KB + 256KB"
115140
fi
116141

117-
echo "spi size: $spi_size KB"
118142
echo ""
119143

120144
touch user/user_main.c
@@ -123,4 +147,4 @@ echo ""
123147
echo "start..."
124148
echo ""
125149

126-
make COMPILE=gcc BOOT=$boot APP=$app SPI_SPEED=$spi_speed SPI_MODE=$spi_mode SPI_SIZE=$spi_size
150+
make COMPILE=gcc BOOT=$boot APP=$app SPI_SPEED=$spi_speed SPI_MODE=$spi_mode SPI_SIZE_MAP=$spi_size_map

‎bin/boot_v1.3(b3).bin

-2.48 KB
Binary file not shown.

‎bin/boot_v1.4(b1).bin

2.69 KB
Binary file not shown.

‎bin/upgrade/readme.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)