arch: common: nocache.ld: One nocache MPU region

Combine the load and noload cache regions for a single MPU aligned block.
This is required to have an MPU region with a size that is a power of 2.

Signed-off-by: Pieter De Gendt <[email protected]>
(cherry picked from commit 8f79086)

Author: pdgendt

arch/common/nocache.ld

@@ -14,7 +14,7 @@ SECTION_DATA_PROLOGUE(_NOCACHE_SECTION_NAME,(NOLOAD),)
 #if defined(CONFIG_MMU)
 	MMU_ALIGN;
 #else
-	MPU_ALIGN(_nocache_noload_ram_size);
+	MPU_ALIGN(_nocache_ram_size);
 #endif
 	_nocache_ram_start = .;
 	_nocache_noload_ram_start = .;
@@ -23,31 +23,21 @@ SECTION_DATA_PROLOGUE(_NOCACHE_SECTION_NAME,(NOLOAD),)
 
 #include <snippets-nocache-section.ld>
 
-#if defined(CONFIG_MMU)
-	MMU_ALIGN;
-#else
-	MPU_ALIGN(_nocache_noload_ram_size);
-#endif
 	_nocache_noload_ram_end = .;
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 _nocache_noload_ram_size = _nocache_noload_ram_end - _nocache_noload_ram_start;
 
 /* Non-cached loadable region of RAM and ROM */
 SECTION_DATA_PROLOGUE(_NOCACHE_LOAD_SECTION_NAME,,)
 {
-#if defined(CONFIG_MMU)
-	MMU_ALIGN;
-#else
-	MPU_ALIGN(_nocache_load_ram_size);
-#endif
 	_nocache_load_ram_start = .;
 	*(.nocache_load)
 	*(".nocache_load.*")
 
 #if defined(CONFIG_MMU)
 	MMU_ALIGN;
 #else
-	MPU_ALIGN(_nocache_load_ram_size);
+	MPU_ALIGN(_nocache_ram_size);
 #endif
 	_nocache_load_ram_end = .;
 	_nocache_ram_end = .;