Skip to content

Commit a2b413a

Browse files
author
Espressif Systems
committed
NEW VERSION: 1.2.0
1. add modified version libgcc.a, remove functions which are already in rom, for removed functions, refer to eagle.rom.addr.v6.ld; 2. add modified version libcirom.a, remove functions which are already in rom, for removed functions, refer to eagle.rom.addr.v6.ld; 3. modify eagle.rom.addr.v6.ld; 4. modify Makefile, project can be separated from SDK; 5. add a project template in examples folder, it's IMPORTANT, PLS refer to readme.txt in project_template; 6. remove app project folder, project_template is a good startup; 7. use gcc by default; 8. modify ld struct, add some comment and Flash MAP, it's clear now; 9. add upgrade.h; 10.other minor changes;
1 parent c24c2a5 commit a2b413a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+748
-1575
lines changed

Makefile

+32-28
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ ifndef PDIR
44

55
endif
66

7-
ifeq ($(COMPILE), gcc)
7+
ifeq ($(COMPILE), xcc)
8+
AR = xt-ar
9+
CC = xt-xcc
10+
NM = xt-nm
11+
CPP = xt-xt++
12+
OBJCOPY = xt-objcopy
13+
OBJDUMP = xt-objdump
14+
else
815
AR = xtensa-lx106-elf-ar
916
CC = xtensa-lx106-elf-gcc
1017
NM = xtensa-lx106-elf-nm
1118
CPP = xtensa-lx106-elf-g++
1219
OBJCOPY = xtensa-lx106-elf-objcopy
1320
OBJDUMP = xtensa-lx106-elf-objdump
14-
else
15-
AR = xt-ar
16-
CC = xt-xcc
17-
NM = xt-nm
18-
CPP = xt-xt++
19-
OBJCOPY = xt-objcopy
20-
OBJDUMP = xt-objdump
2121
endif
2222

2323
BOOT?=none
@@ -238,14 +238,14 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
238238
@mkdir -p $(BINODIR)
239239

240240
ifeq ($(APP), 0)
241-
@$(RM) -r ../bin/eagle.S ../bin/eagle.dump
242-
@$(OBJDUMP) -x -s $< > ../bin/eagle.dump
243-
@$(OBJDUMP) -S $< > ../bin/eagle.S
241+
@$(RM) -r $(BIN_PATH)/eagle.S $(BIN_PATH)/eagle.dump
242+
@$(OBJDUMP) -x -s $< > $(BIN_PATH)/eagle.dump
243+
@$(OBJDUMP) -S $< > $(BIN_PATH)/eagle.S
244244
else
245-
@mkdir -p ../bin/upgrade
246-
@$(RM) -r ../bin/upgrade/$(BIN_NAME).S ../bin/upgrade/$(BIN_NAME).dump
247-
@$(OBJDUMP) -x -s $< > ../bin/upgrade/$(BIN_NAME).dump
248-
@$(OBJDUMP) -S $< > ../bin/upgrade/$(BIN_NAME).S
245+
@mkdir -p $(BIN_PATH)/upgrade
246+
@$(RM) -r $(BIN_PATH)/upgrade/$(BIN_NAME).S $(BIN_PATH)/upgrade/$(BIN_NAME).dump
247+
@$(OBJDUMP) -x -s $< > $(BIN_PATH)/upgrade/$(BIN_NAME).dump
248+
@$(OBJDUMP) -S $< > $(BIN_PATH)/upgrade/$(BIN_NAME).S
249249
endif
250250

251251
@$(OBJCOPY) --only-section .text -O binary $< eagle.app.v6.text.bin
@@ -255,22 +255,28 @@ endif
255255

256256
@echo ""
257257
@echo "!!!"
258+
@echo "SDK_PATH: $(SDK_PATH)"
258259

259260
ifeq ($(app), 0)
260-
@python ../tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map)
261-
@mv eagle.app.flash.bin ../bin/eagle.flash.bin
262-
@mv eagle.app.v6.irom0text.bin ../bin/eagle.irom0text.bin
261+
@python $(SDK_PATH)/tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map)
262+
@mv eagle.app.flash.bin $(BIN_PATH)/eagle.flash.bin
263+
@mv eagle.app.v6.irom0text.bin $(BIN_PATH)/eagle.irom0text.bin
263264
@rm eagle.app.v6.*
265+
@echo "BIN_PATH: $(BIN_PATH)"
266+
@echo ""
264267
@echo "No boot needed."
265-
@echo "Generate eagle.flash.bin and eagle.irom0text.bin successully in folder bin."
268+
@echo "Generate eagle.flash.bin and eagle.irom0text.bin successully in BIN_PATH"
266269
@echo "eagle.flash.bin-------->0x00000"
267270
@echo "eagle.irom0text.bin---->0x40000"
268271
else
272+
@echo "BIN_PATH: $(BIN_PATH)/upgrade"
273+
@echo ""
274+
269275
ifneq ($(boot), new)
270-
@python ../tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map)
276+
@python $(SDK_PATH)/tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map)
271277
@echo "Support boot_v1.1 and +"
272278
else
273-
@python ../tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map)
279+
@python $(SDK_PATH)/tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map)
274280

275281
ifeq ($(size_map), 6)
276282
@echo "Support boot_v1.4 and +"
@@ -283,9 +289,9 @@ else
283289
endif
284290
endif
285291

286-
@mv eagle.app.flash.bin ../bin/upgrade/$(BIN_NAME).bin
292+
@mv eagle.app.flash.bin $(BIN_PATH)/upgrade/$(BIN_NAME).bin
287293
@rm eagle.app.v6.*
288-
@echo "Generate $(BIN_NAME).bin successully in folder bin/upgrade."
294+
@echo "Generate $(BIN_NAME).bin successully in BIN_PATH"
289295
@echo "boot.bin------------>0x00000"
290296
@echo "$(BIN_NAME).bin--->$(addr)"
291297
endif
@@ -389,8 +395,6 @@ $(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image)))))
389395
# Required for each makefile to inherit from the parent
390396
#
391397

392-
INCLUDES := $(INCLUDES) -I $(PDIR)include -I $(PDIR)extra_include
393-
INCLUDES += -I $(PDIR)include/lwip -I $(PDIR)include/lwip/ipv4 -I $(PDIR)include/lwip/ipv6
394-
INCLUDES += -I $(PDIR)include/espressif
395-
PDIR := ../$(PDIR)
396-
sinclude $(PDIR)Makefile
398+
INCLUDES := $(INCLUDES) -I $(SDK_PATH)/include -I $(SDK_PATH)/extra_include
399+
INCLUDES += -I $(SDK_PATH)/include/lwip -I $(SDK_PATH)/include/lwip/ipv4 -I $(SDK_PATH)/include/lwip/ipv6
400+
INCLUDES += -I $(SDK_PATH)/include/espressif

README.md

+35-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,48 @@
1-
esp_iot_rtos_sdk
2-
================
3-
4-
ESP8266 new SDK based on FreeRTOS
1+
# esp_iot_rtos_sdk #
2+
3+
----------
54

5+
ESP8266 SDK based on FreeRTOS.
66

7-
Note
7+
## Note ##
88

99
APIs of "esp_iot_rtos_sdk" are same as "esp_iot_sdk"
1010

1111
More details in "Wiki" !
1212

13-
14-
Compile
13+
## Requrements ##
14+
15+
You can use both xcc and gcc to compile your project, gcc is recommended.
16+
For gcc, please refer to [esp-open-sdk](https://github.com/pfalcon/esp-open-sdk).
17+
18+
19+
## Compile ##
20+
21+
Clone esp_iot_rtos_sdk, e.g., to ~/esp_iot_rtos_sdk.
22+
23+
$git clone https://github.com/espressif/esp_iot_rtos_sdk.git
24+
25+
Set sdk path:
26+
27+
$export SDK_PATH=~/esp_iot_rtos_sdk
28+
29+
Set bin path:
30+
31+
$export BIN_PATH=~/esp8266_bin
32+
33+
Generated bins will be located here.
34+
35+
SDK_PATH and BIN_PATH **MUST** be set firstly, you can write to .bashrc or other shell init sript.
36+
37+
esp_iot_rtos_sdk/examples/project_template is a project template, you can copy this to anywhere, e.g., to ~/workspace/project_template.
1538

16-
using command: ./gen_misc.sh
39+
Generate bin:
40+
41+
./gen_misc.sh
1742

43+
Just follow the tips and steps.
1844

19-
Download
45+
## Download ##
2046

2147
eagle.app.v6.flash.bin, downloads to flash 0x00000
2248

app/readme.txt

-40
This file was deleted.

app/user/user_main.c

-172
This file was deleted.

0 commit comments

Comments
 (0)