Merge branch 'bugfix/spiram_reserve_size_pr5373_v4.2' into 'release/v4.2'

SPIRAM reserved memory size fixes (v4.2)

See merge request espressif/esp-idf!11516

components/soc/src/esp32/soc_memory_layout.c

@@ -74,12 +74,7 @@ const soc_memory_type_desc_t soc_memory_types[] = {
 
 const size_t soc_memory_type_count = sizeof(soc_memory_types)/sizeof(soc_memory_type_desc_t);
 
-#if CONFIG_SPIRAM_SIZE == -1
-// Assume we need to reserve 4MB in the auto-detection case
 #define RESERVE_SPIRAM_SIZE (4*1024*1024)
-#else
-#define RESERVE_SPIRAM_SIZE CONFIG_SPIRAM_SIZE
-#endif
 
 /*
 Region descriptors. These describe all regions of memory available, and map them to a type in the above type.