Skip to content

Commit d4e44e5

Browse files
gerekongerekon
committed
esp32_s2: Adds support for different chip revsions
1 parent 22f4cbb commit d4e44e5

28 files changed

+1288
-451
lines changed

‎contrib/loaders/flash/esp/esp32/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ STUB_CHIP_PATH := $(shell pwd)
3131
STUB_COMMON_PATH := $(STUB_CHIP_PATH)/..
3232
STUB_OBJ_DEPS := sdkconfig.h
3333
STUB_LD_SCRIPT := stub.ld
34+
STUB_CHIP := ESP32
3435

3536
SRCS := $(IDF_PATH)/components/soc/esp32/rtc_clk.c \
3637
$(IDF_PATH)/components/soc/esp32/rtc_time.c \

‎contrib/loaders/flash/esp/esp32/sdkconfig.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,23 @@
1111
#define CONFIG_ESP32_APPTRACE_ENABLE 1
1212
/* Send over Trace Memory Transport */
1313
#define CONFIG_ESP32_APPTRACE_DEST_TRAX 1
14+
#define CONFIG_ESP32_TRACEMEM_RESERVE_DRAM 0x8000
1415
/* Debug UART number */
15-
#define CONFIG_CONSOLE_UART_NUM 0
16+
#define CONFIG_CONSOLE_UART_NUM 0
1617
/* Debug UART baudrate */
1718
#define CONFIG_CONSOLE_UART_BAUDRATE 115200
1819
/* ESP32 xtal freq config */
19-
#define CONFIG_ESP32_XTAL_FREQ 0
20-
#define ESP_APPTRACE_DOWN_BUF_SIZE 16384
20+
#define CONFIG_ESP32_XTAL_FREQ 0
21+
#define ESP_APPTRACE_DOWN_BUF_SIZE 16384
2122

2223

2324
/* needed due to apptrace sources usage */
24-
#define CONFIG_LOG_DEFAULT_LEVEL 0
25+
#define CONFIG_LOG_DEFAULT_LEVEL 0
2526
/* needed due to various checks in IDF headers */
2627
#define CONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
2728
/* TODO: use current clk, get it from PLL settings */
2829
#define CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ 240
2930
/* Unused by stub, just for compilation of IDF */
30-
#define CONFIG_PARTITION_TABLE_OFFSET 0x8000
31+
#define CONFIG_PARTITION_TABLE_OFFSET 0x8000
3132

3233
#endif /*_STUB_SDKCONFIG_H_ */

‎contrib/loaders/flash/esp/esp32_s2/Makefile‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,20 @@ STUB_CHIP_PATH := $(shell pwd)
3131
STUB_COMMON_PATH := $(STUB_CHIP_PATH)/..
3232
STUB_OBJ_DEPS := sdkconfig.h
3333
STUB_LD_SCRIPT := stub.ld
34+
STUB_CHIP := ESP32_S2
3435

35-
SRCS := $(IDF_PATH)/components/soc/esp32s2beta/rtc_clk.c \
36-
$(IDF_PATH)/components/soc/esp32s2beta/rtc_time.c \
37-
$(IDF_PATH)/components/xtensa/eri.c
36+
SRCS := $(IDF_PATH)/components/soc/esp32c/rtc_clk.c \
37+
$(IDF_PATH)/components/soc/esp32c/rtc_time.c \
38+
$(IDF_PATH)/components/xtensa-debug-module/eri.c
3839

3940
CFLAGS +=
4041

41-
INCLUDES := -I$(IDF_PATH)/components/esp32s2beta/include -I$(IDF_PATH)/components/soc/esp32s2beta/include \
42-
-I$(IDF_PATH)/components/esp_rom/include -I$(IDF_PATH)/components/esp_rom/include/esp32s2beta \
43-
-I$(IDF_PATH)/components/esp_common/include -I$(IDF_PATH)/components/xtensa/include \
44-
-I$(IDF_PATH)/components/xtensa/esp32s2beta/include
42+
INCLUDES := -I$(IDF_PATH)/components/esp32c/include -I$(IDF_PATH)/components/soc/esp32c/include
4543

4644
DEFINES :=
4745

48-
LDFLAGS += -L$(IDF_PATH)/components/esp32s2beta/ld -T$(IDF_PATH)/components/esp_rom/esp32s2beta/ld/esp32s2beta.rom.spiflash.ld \
49-
-T$(IDF_PATH)/components/esp_rom/esp32s2beta/ld/esp32s2beta.rom.ld
50-
51-
#-T$(IDF_PATH)/components/esp32c/ld/esp32.rom.spiram_incompatible_fns.ld -T$(IDF_PATH)/components/esp32c/ld/esp32.peripherals.ld
46+
LDFLAGS += -L$(IDF_PATH)/components/esp32c/ld -T$(IDF_PATH)/components/esp32c/ld/esp32.rom.spiflash.ld \
47+
-T$(IDF_PATH)/components/esp32c/ld/esp32.rom.ld -T$(IDF_PATH)/components/esp32c/ld/esp32.rom.spiram_incompatible_fns.ld \
48+
-T$(IDF_PATH)/components/esp32c/ld/esp32.peripherals.ld
5249

5350
include ../stub_common.mk

‎contrib/loaders/flash/esp/esp32_s2/sdkconfig.h‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef _STUB_SDKCONFIG_H_
22
#define _STUB_SDKCONFIG_H_
33

4-
#define CONFIG_IDF_TARGET_ESP32S2BETA 1
54
/* Use ROM flash driver patch */
65
#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
76
/* Disable application module multi-threading lock */
@@ -10,21 +9,25 @@
109
#define CONFIG_ESP32_APPTRACE_ENABLE 1
1110
/* Send over Trace Memory Transport */
1211
#define CONFIG_ESP32_APPTRACE_DEST_TRAX 1
12+
#define CONFIG_TRACEMEM_RESERVE_DRAM 0x8000
1313
/* Debug UART number */
14-
#define CONFIG_CONSOLE_UART_NUM 0
14+
#define CONFIG_CONSOLE_UART_NUM 0
1515
/* Debug UART baudrate */
1616
#define CONFIG_CONSOLE_UART_BAUDRATE 115200
1717
/* ESP32 xtal freq config */
18-
#define CONFIG_ESP32_XTAL_FREQ 0
19-
#define ESP_APPTRACE_DOWN_BUF_SIZE 16384
18+
#define CONFIG_ESP32_XTAL_FREQ 0
19+
#define ESP_APPTRACE_DOWN_BUF_SIZE 16384
20+
#define CONFIG_CHIP_IS_ESP32C 1
21+
/* TODO: remove this */
22+
#define CONFIG_HARDWARE_IS_FPGA 1
2023

2124
/* needed due to apptrace sources usage */
22-
#define CONFIG_LOG_DEFAULT_LEVEL 0
25+
#define CONFIG_LOG_DEFAULT_LEVEL 0
2326
/* needed due to various checks in IDF headers */
2427
#define CONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
2528
/* TODO: use current clk, get it from PLL settings */
2629
#define CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ 240
2730
/* Unused by stub, just for compilation of IDF */
28-
#define CONFIG_PARTITION_TABLE_OFFSET 0x8000
31+
#define CONFIG_PARTITION_TABLE_OFFSET 0x8000
2932

3033
#endif /*_STUB_SDKCONFIG_H_ */

‎contrib/loaders/flash/esp/esp32_s2/stub_flasher_chip.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@ extern void spi_flash_attach(uint32_t spiconfig, uint32_t arg2);
3737
static void esp32_s2_flash_disable_cache(uint32_t *saved_state)
3838
{
3939
saved_state[0] = Cache_Suspend_ICache();
40-
if (!Cache_Drom0_Using_ICache())
41-
saved_state[1] = Cache_Suspend_DCache();
4240
}
4341

4442
static void esp32_s2_flash_restore_cache(uint32_t *saved_state)
4543
{
4644
Cache_Resume_ICache(saved_state[0]);
47-
if (!Cache_Drom0_Using_ICache())
48-
Cache_Resume_DCache(saved_state[1]);
4945
}
5046

5147
uint32_t stub_flash_get_id(void)

0 commit comments

Comments
 (0)