kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 10:03:50 +01:00
Code Releases Activity

cpu/esp8266: ESP8266_SDK_DIR renamed

Browse Source 
To make the migration progress to the new RTOS SDK easier, the ESP8266_SDK_DIR variable was renamed to ESP8266_RTOS_SDK_DIR.
This commit is contained in:
Gunar Schorcht 2019-10-18 17:45:40 +02:00
parent 9facce8c02
commit b15d7df6dc
11 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/esp8266/Makefile
View File

@ -12,6 +12,6 @@ ifneq (, $(filter esp_wifi, $(USEMODULE)))
DIRS += esp-wifi
endif
INCLUDES += -I$(ESP8266_SDK_DIR)/components/esp8266/include/internal
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/esp8266/include/internal
include $(RIOTBASE)/Makefile.base

26
cpu/esp8266/Makefile.include
View File

@ -1,9 +1,9 @@
# check some environment variables first
ifndef ESP8266_SDK_DIR
$(info ESP8266_SDK_DIR should be defined as /path/to/sdk directory)
$(info ESP8266_SDK_DIR is set by default to /opt/esp/esp-open-sdk/sdk)
export ESP8266_SDK_DIR=/opt/esp/ESP8266-RTOS-SDK
ifndef ESP8266_RTOS_SDK_DIR
$(info ESP8266_RTOS_SDK_DIR should be defined as /path/to/sdk directory)
$(info ESP8266_RTOS_SDK_DIR is set by default to /opt/esp/ESP8266-RTOS-SDK)
export ESP8266_RTOS_SDK_DIR=/opt/esp/ESP8266-RTOS-SDK
endif
# Options to control the compilation
@ -86,14 +86,14 @@ INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/esp8266/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/esp8266/include/esp8266
INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/heap/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/log/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/
INCLUDES += -I$(ESP8266_SDK_DIR)/components/bootloader_support/include/
INCLUDES += -I$(ESP8266_SDK_DIR)/components/esp8266/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/esp8266/include/esp8266
INCLUDES += -I$(ESP8266_SDK_DIR)/components/heap/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/heap/port/esp8266/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/nvs_flash/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/spi_flash/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/bootloader_support/include/
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/esp8266/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/esp8266/include/esp8266
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/heap/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/heap/port/esp8266/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/nvs_flash/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/spi_flash/include
CFLAGS += -D__ESP_FILE__=__FILE__ -DDEVELHELP
CFLAGS += -Wno-unused-parameter -Wformat=0
@ -172,7 +172,7 @@ FLASH_FREQ = 26m # FIX configuration, DO NOT CHANGE
FLASH_SIZE ?= 1MB
FLASHDEPS += preflash
PREFLASHER ?= $(ESP8266_SDK_DIR)/components/esptool_py/esptool/esptool.py
PREFLASHER ?= $(ESP8266_RTOS_SDK_DIR)/components/esptool_py/esptool/esptool.py
PREFFLAGS = --chip esp8266 elf2image
PREFFLAGS += --flash_mode $(FLASH_MODE) --flash_size $(FLASH_SIZE)
PREFFLAGS += --flash_freq $(FLASH_FREQ) --version 3

6
cpu/esp8266/doc.txt
View File

@ -334,10 +334,10 @@ necessary changes.
SDK does not need to be compiled in any way.
To use the installed ESP8266 RTOS SDK, set the environment variable
`ESP8266_SDK_DIR`.
`ESP8266_RTOS_SDK_DIR`.
```
export ESP8266_SDK_DIR=$HOME/esp/ESP8266_RTOS_SDK
export ESP8266_RTOS_SDK_DIR=$HOME/esp/ESP8266_RTOS_SDK
```
@ -393,7 +393,7 @@ correctly to
```
export PATH=/path/to/esp/esptool-esp8266-rtos-sdk-v3:/path/to/esp/xtensa-lx106-elf/bin:$PATH
export ESP8266_SDK_DIR=/path/to/esp/ESP8266_RTOS_SDK
export ESP8266_RTOS_SDK_DIR=/path/to/esp/ESP8266_RTOS_SDK
```
## <a name="esp8266_compile_options"> Compile Options </a> &nbsp;[[TOC](#esp8266_toc)]

4
cpu/esp8266/esp-wifi/Makefile
View File

@ -1,7 +1,7 @@
MODULE=esp_wifi
# we have to do it in that way to avoid that pkg/lwip is found first
CFLAGS += -I$(ESP8266_SDK_DIR)/components/lwip/lwip/src/include
CFLAGS += -I$(ESP8266_SDK_DIR)/components/lwip/port/esp8266/include/
CFLAGS += -I$(ESP8266_RTOS_SDK_DIR)/components/lwip/lwip/src/include
CFLAGS += -I$(ESP8266_RTOS_SDK_DIR)/components/lwip/port/esp8266/include/
include $(RIOTBASE)/Makefile.base

4
cpu/esp8266/vendor/esp-idf/esp8266/source/Makefile vendored
View File

@ -2,5 +2,5 @@ MODULE=esp_idf_esp8266
include $(RIOTBASE)/Makefile.base
INCLUDES += -I$(ESP8266_SDK_DIR)/components/esp8266/source
INCLUDES += -I$(ESP8266_SDK_DIR)/components/util/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/esp8266/source
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/util/include

4
cpu/esp8266/vendor/esp-idf/nvs_flash/Makefile vendored
View File

@ -5,5 +5,5 @@ include $(RIOTBASE)/Makefile.base
CFLAGS += -DESP_PLATFORM
CXXFLAGS += -std=c++11
INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/log/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/nvs_flash/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/spi_flash/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/nvs_flash/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/spi_flash/include

4
cpu/esp8266/vendor/esp-idf/nvs_flash/src/Makefile vendored
View File

@ -4,5 +4,5 @@ include $(RIOTBASE)/Makefile.base
CFLAGS += -DESP_PLATFORM -DNVS_CRC_HEADER_FILE=\"crc.h\"
CXXFLAGS += -std=c++11
INCLUDES += -I$(ESP8266_SDK_DIR)/components/nvs_flash/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/util/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/nvs_flash/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/util/include

2
cpu/esp8266/vendor/esp-idf/spi_flash/Makefile vendored
View File

@ -2,4 +2,4 @@ MODULE=esp_idf_spi_flash
include $(RIOTBASE)/Makefile.base
INCLUDES += -I$(ESP8266_SDK_DIR)/components/bootloader_support/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/bootloader_support/include

2
cpu/esp8266/vendor/esp-idf/util/src/Makefile vendored
View File

@ -2,4 +2,4 @@ MODULE=esp_idf_util
include $(RIOTBASE)/Makefile.base
INCLUDES += -I$(ESP8266_SDK_DIR)/components/util/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/util/include

4
cpu/esp8266/vendor/esp-idf/wpa_supplicant/port/Makefile vendored
View File

@ -5,8 +5,8 @@ include $(RIOTBASE)/Makefile.base
# we have to do it in that way to avoid that $(RIOTBASE)/sys/include/crypto
# is found first
INCLUDES = -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/wpa_supplicant/port/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/wpa_supplicant/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/wpa_supplicant/port/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/wpa_supplicant/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/wpa_supplicant/port/include
CFLAGS += -D__ets__ -DESPRESSIF_USE -DESP_PLATFORM=1
CFLAGS += -Wno-strict-aliasing

4
cpu/esp8266/vendor/esp-idf/wpa_supplicant/src/crypto/Makefile vendored
View File

@ -6,8 +6,8 @@ include $(RIOTBASE)/Makefile.base
# is found first
INCLUDES = -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/wpa_supplicant/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/wpa_supplicant/port/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/wpa_supplicant/include
INCLUDES += -I$(ESP8266_SDK_DIR)/components/wpa_supplicant/port/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/wpa_supplicant/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/wpa_supplicant/port/include
CFLAGS += -D__ets__ -DESPRESSIF_USE -DESP_PLATFORM=1
CFLAGS += -Wno-strict-aliasing