Skip to content

Commit c5857dc

Browse files
Glauber Maroto Ferreiranashif
authored andcommitted
soc: esp32s2: SPIRAM: remove unused configs
and updates hal_espressif's revision. Signed-off-by: Glauber Maroto Ferreira <[email protected]>
1 parent 89ec6f6 commit c5857dc

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_ESP_HEAP_MEM_POOL_REGION_1_SIZE=100000
2+
CONFIG_ESP_HEAP_SEARCH_ALL_REGIONS=n
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
CONFIG_ESP_SPIRAM=y
22
CONFIG_ESP_HEAP_MIN_EXTRAM_THRESHOLD=2048
33
CONFIG_HEAP_MEM_POOL_SIZE=98304
4-
CONFIG_ESP_HEAP_MEM_POOL_REGION_1_SIZE=100000
5-
CONFIG_ESP_HEAP_SEARCH_ALL_REGIONS=n

soc/xtensa/esp32s2/soc.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extern void z_cstart(void);
3030
extern void z_bss_zero(void);
3131
extern void rtc_clk_cpu_freq_set_xtal(void);
3232

33-
#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
33+
#if CONFIG_ESP_SPIRAM
3434
extern int _ext_ram_bss_start;
3535
extern int _ext_ram_bss_end;
3636
#endif
@@ -176,9 +176,7 @@ void __attribute__((section(".iram1"))) __start(void)
176176
printk("SPIRAM size is less than configured size, aborting.\n");
177177
abort();
178178
}
179-
#endif
180179

181-
#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
182180
memset(&_ext_ram_bss_start,
183181
0,
184182
(&_ext_ram_bss_end - &_ext_ram_bss_start) * sizeof(_ext_ram_bss_start));

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ manifest:
6767
groups:
6868
- hal
6969
- name: hal_espressif
70-
revision: c8a4101133dd7a77e118a23b0c03c765c8a55ba7
70+
revision: c4a591c35385be59a41cde7efc85fe7660172979
7171
path: modules/hal/espressif
7272
west-commands: west/west-commands.yml
7373
groups:

0 commit comments

Comments
 (0)