heap: simplify heap size calculation

Fixes two issues:

1. remove confusingly named CONFIG_SOF_ZEPHYR_VIRTUAL_HEAP_SIZE since
it isn't used for virtual heap but for a traditional one - not using
run-time memory mapping.
2. instead of adding CONFIG_SOF_ZEPHYR_VIRTUAL_HEAP_SIZE switch back
to using CONFIG_SOF_ZEPHYR_HEAP_SIZE also when CONFIG_VIRTUAL_HEAP is
selected by just adjusting its value.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

zephyr/Kconfig

@@ -48,6 +48,7 @@ config SOF_ZEPHYR_HEAP_CACHED
 
 config SOF_ZEPHYR_HEAP_SIZE
 	hex "Size of the Zephyr heap for SOF"
+	default 0x40000 if VIRTUAL_HEAP
 	default 0xF0000 if SOC_ACE15_MTPM || SOC_ACE20_LNL
 	default 0xD0000 if SOC_ACE30 || SOC_ACE40
 	default 0x0
@@ -81,15 +82,6 @@ config SOF_ZEPHYR_SHARED_BUFFER_HEAP_SIZE
 	 NOTE: Keep in mind that the shared heap size should not be greater than the
 	 heap size.
 
-config SOF_ZEPHYR_VIRTUAL_HEAP_SIZE
-	hex "Size of the Zephyr virtual heap for SOF"
-	depends on VIRTUAL_HEAP
-	default 0x40000
-	help
-	 Support scaling of the virtual address heap size for different platforms.
-	 NOTE: Keep in mind that the heap size should not be greater than the physical
-	 memory size of the system defined in DT (and this includes baseFW text/data).
-
 config SOF_ZEPHYR_VIRTUAL_HEAP_REGION_SIZE
 	hex "Size in bytes of virtual memory region for virtual heap shared for all cores"
 	depends on MM_DRV_INTEL_ADSP_MTL_TLB

zephyr/lib/alloc.c

@@ -29,11 +29,6 @@
 
 struct vmh_heap;
 struct vmh_heap *virtual_buffers_heap;
-
-#undef	HEAPMEM_SIZE
-/* Buffers are allocated from virtual space so we can safely reduce the heap size.
- */
-#define	HEAPMEM_SIZE CONFIG_SOF_ZEPHYR_VIRTUAL_HEAP_SIZE
 #endif /* CONFIG_VIRTUAL_HEAP */