diff --git a/samples/boards/esp32/spiram_test/boards/esp32.conf b/samples/boards/esp32/spiram_test/boards/esp32.conf
new file mode 100644
index 00000000000..f07af61dcda
--- /dev/null
+++ b/samples/boards/esp32/spiram_test/boards/esp32.conf
@@ -0,0 +1,2 @@
+CONFIG_ESP_HEAP_MEM_POOL_REGION_1_SIZE=100000
+CONFIG_ESP_HEAP_SEARCH_ALL_REGIONS=n
diff --git a/samples/boards/esp32/spiram_test/prj.conf b/samples/boards/esp32/spiram_test/prj.conf
index 7f081ecd617..13e5565c78b 100644
--- a/samples/boards/esp32/spiram_test/prj.conf
+++ b/samples/boards/esp32/spiram_test/prj.conf
@@ -1,5 +1,3 @@
 CONFIG_ESP_SPIRAM=y
 CONFIG_ESP_HEAP_MIN_EXTRAM_THRESHOLD=2048
 CONFIG_HEAP_MEM_POOL_SIZE=98304
-CONFIG_ESP_HEAP_MEM_POOL_REGION_1_SIZE=100000
-CONFIG_ESP_HEAP_SEARCH_ALL_REGIONS=n
diff --git a/soc/xtensa/esp32s2/soc.c b/soc/xtensa/esp32s2/soc.c
index ee00bb9b678..94b5186caec 100644
--- a/soc/xtensa/esp32s2/soc.c
+++ b/soc/xtensa/esp32s2/soc.c
@@ -30,7 +30,7 @@ extern void z_cstart(void);
 extern void z_bss_zero(void);
 extern void rtc_clk_cpu_freq_set_xtal(void);
 
-#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
+#if CONFIG_ESP_SPIRAM
 extern int _ext_ram_bss_start;
 extern int _ext_ram_bss_end;
 #endif
@@ -176,9 +176,7 @@ void __attribute__((section(".iram1"))) __start(void)
 		printk("SPIRAM size is less than configured size, aborting.\n");
 		abort();
 	}
-#endif
 
-#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
 	memset(&_ext_ram_bss_start,
 		0,
 		(&_ext_ram_bss_end - &_ext_ram_bss_start) * sizeof(_ext_ram_bss_start));
diff --git a/west.yml b/west.yml
index 8539a7cbc96..947f61bafb3 100644
--- a/west.yml
+++ b/west.yml
@@ -67,7 +67,7 @@ manifest:
       groups:
         - hal
     - name: hal_espressif
-      revision: c8a4101133dd7a77e118a23b0c03c765c8a55ba7
+      revision: c4a591c35385be59a41cde7efc85fe7660172979
       path: modules/hal/espressif
       west-commands: west/west-commands.yml
       groups: