bsps: Replace NIRVANA region

Replace the "NIRVANA" region with the more verbose "UNEXPECTED_SECTIONS"
region.  Move the region definition into the "linkcmds.base" files.

51 files changed, 68 insertions, 71 deletions

diff --git a/c/src/lib/libbsp/arm/csb336/startup/linkcmds b/c/src/lib/libbsp/arm/csb336/startup/linkcmds
index 5619fedf04..0e13a9ceac 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/csb336/startup/linkcmds
@@ -1,7 +1,6 @@
 MEMORY {
 	SDRAM_MMU : ORIGIN = 0x08200000, LENGTH = 16k
 	SDRAM : ORIGIN = 0x08204000, LENGTH = 30M - 16k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337
index 03f03162db..62db0dfec3 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337
+++ b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337
@@ -2,7 +2,6 @@ MEMORY {
 	SDRAM_MMU : ORIGIN = 0x20100000, LENGTH = 16k
 	SDRAM : ORIGIN = 0x20104000, LENGTH = 15M - 16k
 	SRAM : ORIGIN = 0x00200000, LENGTH = 16k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637 b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637
index 8e660c231c..c86a0ad1a8 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637
+++ b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637
@@ -2,7 +2,6 @@ MEMORY {
 	SDRAM_MMU : ORIGIN = 0x20100000, LENGTH = 16k
 	SDRAM : ORIGIN = 0x20104000, LENGTH = 63M - 16k
 	SRAM : ORIGIN = 0x00200000, LENGTH = 16k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds b/c/src/lib/libbsp/arm/edb7312/startup/linkcmds
index 7b5a0b8553..f0a12a77b4 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/edb7312/startup/linkcmds
@@ -1,6 +1,5 @@
 MEMORY {
 	SDRAM : ORIGIN = 0x00000000, LENGTH = 16M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/linkcmds b/c/src/lib/libbsp/arm/gdbarmsim/startup/linkcmds
index 2b8e2153a2..45b0f75aca 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/gdbarmsim/startup/linkcmds
@@ -1,6 +1,5 @@
 MEMORY {
 	RAM : ORIGIN = 0x00000000, LENGTH = 4M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM);
diff --git a/c/src/lib/libbsp/arm/gp32/startup/linkcmds b/c/src/lib/libbsp/arm/gp32/startup/linkcmds
index bfba44083a..d705a2b862 100644
--- a/c/src/lib/libbsp/arm/gp32/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/gp32/startup/linkcmds
@@ -1,7 +1,6 @@
 MEMORY {
 	SDRAM_MMU : ORIGIN = 0x0c000000, LENGTH = 16k
 	SDRAM : ORIGIN = 0x0c004000, LENGTH = 7M - 16k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/gumstix/startup/linkcmds b/c/src/lib/libbsp/arm/gumstix/startup/linkcmds
index 37a5318aa1..84c5ccadab 100644
--- a/c/src/lib/libbsp/arm/gumstix/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/gumstix/startup/linkcmds
@@ -2,7 +2,6 @@ MEMORY {
 	SDRAM_MMU : ORIGIN = 0xa0000000, LENGTH = 16k
 	SDRAM : ORIGIN = 0xa0004000, LENGTH = 64M - 16k
 	SRAM : ORIGIN = 0x00000000, LENGTH = 16k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965 b/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965
index aad5e0305a..b3de8257d6 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965
+++ b/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965
@@ -7,7 +7,6 @@
 MEMORY {
 	RAM_INT (AIW) : ORIGIN = 0x20000000, LENGTH = 16M
 	ROM_INT (RX)  : ORIGIN = 0x00000000, LENGTH = 64M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_INT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram
index 60faf1267e..88aaef7aed 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram
@@ -4,7 +4,6 @@ MEMORY {
 	RAM_INT (AIW) : ORIGIN = 0x10000000, LENGTH = 64k
 	RAM_PER (AIW) : ORIGIN = 0x20000000, LENGTH = 32k
 	RAM_EXT (AIW) : ORIGIN = 0xa0000000, LENGTH = 32M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_EXT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int
index dd87517114..5fa6a800d4 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int
@@ -4,7 +4,6 @@ MEMORY {
 	ROM_INT (RX)  : ORIGIN = 0x00000000, LENGTH = 512k
 	RAM_INT (AIW) : ORIGIN = 0x10000000, LENGTH = 64k
 	RAM_EXT (AIW) : ORIGIN = 0xa0000000, LENGTH = 32M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_INT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc2362 b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc2362
index a9e46a17c8..fec6a25c4c 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc2362
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc2362
@@ -39,7 +39,6 @@ MEMORY {
 	RAM_USB (AIW) : ORIGIN = 0x7fd00000, LENGTH = 8k
 	RAM_ETH (AIW) : ORIGIN = 0x7fe00000, LENGTH = 16k
 	ROM_INT (RX)  : ORIGIN = 0x00000000, LENGTH = 128k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_INT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc23xx_tli800 b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc23xx_tli800
index 987c14053e..3f097634fd 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc23xx_tli800
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc23xx_tli800
@@ -43,7 +43,6 @@ MEMORY {
 	ROM_BOOT (RX) : ORIGIN = 0x00000000, LENGTH = 4k
 	ROM_CFG (RX)  : ORIGIN = 0x00001000, LENGTH = 4k
 	ROM_INT (RX)  : ORIGIN = 0x00002000, LENGTH = 120k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_BOOT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ea b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ea
index eadbb4e7eb..f7bced5019 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ea
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ea
@@ -36,7 +36,6 @@
 MEMORY {
 	RAM_INT (AIW) : ORIGIN = 0x40000000, LENGTH = 64k
 	RAM_EXT (AIW) : ORIGIN = 0xa0000000, LENGTH = 32M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_EXT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_ram b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_ram
index 0a285826f0..d11731b24e 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_ram
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_ram
@@ -36,7 +36,6 @@
 MEMORY {
 	RAM_INT (AIW) : ORIGIN = 0x40000000, LENGTH = 64k
 	RAM_EXT (AIW) : ORIGIN = 0xa0000000, LENGTH = 8M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_EXT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_ext b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_ext
index 74d63e647b..5398d6606f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_ext
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_ext
@@ -40,7 +40,6 @@ MEMORY {
 	RAM_EXT (AIW) : ORIGIN = 0xa0400000, LENGTH = 4M
 	ROM_BOOT (RX) : ORIGIN = 0x81000000, LENGTH = 16k
 	ROM_EXT (RX)  : ORIGIN = 0x81010000, LENGTH = 2M - 64k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_BOOT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_int b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_int
index 48246c55a0..0a314d59cb 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_int
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_int
@@ -40,7 +40,6 @@ MEMORY {
 	RAM_INT (AIW) : ORIGIN = 0x40008000, LENGTH = 32k
 	RAM_EXT (AIW) : ORIGIN = 0xa0400000, LENGTH = 4M
 	ROM_INT (RX)  : ORIGIN = 0x00000000, LENGTH = 512k - 8k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_INT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_ram b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_ram
index 6198b58e54..9d39f8d243 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_ram
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_ram
@@ -9,7 +9,6 @@ MEMORY {
 	RAM_EXT : ORIGIN = 0xa0000000, LENGTH = 32M
 	ROM_INT : ORIGIN = 0x00000000, LENGTH = 512k - 8k
 	ROM_EXT : ORIGIN = 0x80000000, LENGTH = 4M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_EXT);
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_rom_int b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_rom_int
index f49b884690..851c4167be 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_rom_int
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_rom_int
@@ -9,7 +9,6 @@ MEMORY {
 	RAM_EXT : ORIGIN = 0xa0000000, LENGTH = 32M
 	ROM_INT : ORIGIN = 0x00000000, LENGTH = 512k - 8k
 	ROM_EXT : ORIGIN = 0x80000000, LENGTH = 4M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_INT);
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx
index 810d187b5b..a466ecfe6f 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx
+++ b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx
@@ -39,7 +39,6 @@ MEMORY {
 	RAM_MMU : ORIGIN = 0x80000000, LENGTH = 16k /* SDRAM on DYCS0 */
 	RAM_SCRATCH : ORIGIN = 0x80004000, LENGTH = 4k /* SDRAM on DYCS0 */
 	RAM_EXT : ORIGIN = 0x80005000, LENGTH = 32M - 20k /* SDRAM on DYCS0 */
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_EXT);
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_1 b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_1
index 67d18e0340..f5f8cb60ca 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_1
+++ b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_1
@@ -39,7 +39,6 @@ MEMORY {
 	RAM_VEC : ORIGIN = 0x0803a000, LENGTH = 8k
 	RAM_MMU : ORIGIN = 0x0803c000, LENGTH = 16k
 	RAM_SCRATCH : ORIGIN = 0x80004000, LENGTH = 4k /* SDRAM on DYCS0 */
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_INT);
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_2 b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_2
index 9fc98859e5..bc457a3731 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_2
+++ b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_2
@@ -40,7 +40,6 @@ MEMORY {
 	RAM_MMU : ORIGIN = 0x80000000, LENGTH = 16k /* SDRAM on DYCS0 */
 	RAM_SCRATCH : ORIGIN = 0x80004000, LENGTH = 4k /* SDRAM on DYCS0 */
 	RAM_EXT : ORIGIN = 0x81c00000, LENGTH = 4M /* SDRAM on DYCS0 */
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_EXT);
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_phycore b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_phycore
index 4f448268e0..b094fb119c 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_phycore
+++ b/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_phycore
@@ -40,7 +40,6 @@ MEMORY {
 	RAM_MMU : ORIGIN = 0x80000000, LENGTH = 16k /* SDRAM on DYCS0 */
 	RAM_EXT : ORIGIN = 0x80004000, LENGTH = 64M - 16k /* SDRAM on DYCS0 */
 	ROM_EXT : ORIGIN = 0xe0000000, LENGTH = 2M /* NOR flash on CS0 */
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM_EXT);
diff --git a/c/src/lib/libbsp/arm/nds/startup/linkcmds b/c/src/lib/libbsp/arm/nds/startup/linkcmds
index f8cf10197b..964bb6c9b3 100644
--- a/c/src/lib/libbsp/arm/nds/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/nds/startup/linkcmds
@@ -3,7 +3,6 @@ MEMORY {
 	EWRAM : ORIGIN = 0x02000000, LENGTH = 4M - 4k
 	DTCM : ORIGIN = 0x0b000000, LENGTH = 16k
 	ITCM : ORIGIN = 0x01000000, LENGTH = 32k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", EWRAM);
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds b/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
index 003e94b12b..0d5625c6c0 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
@@ -1,7 +1,6 @@
 MEMORY {
 	SDRAM : ORIGIN = 0x81000000, LENGTH = 512k
 	SRAM : ORIGIN = 0x40000000, LENGTH = 16k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base b/c/src/lib/libbsp/arm/shared/startup/linkcmds.base
index 5174d480ad..d6561dde77 100644
--- a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base
+++ b/c/src/lib/libbsp/arm/shared/startup/linkcmds.base
@@ -56,6 +56,10 @@ bsp_stack_und_size = ALIGN (bsp_stack_und_size, bsp_stack_align);
 bsp_stack_main_size = DEFINED (bsp_stack_main_size) ? bsp_stack_main_size : 0;
 bsp_stack_main_size = ALIGN (bsp_stack_main_size, bsp_stack_align);
 
+MEMORY {
+	UNEXPECTED_SECTIONS : ORIGIN = 0xffffffff, LENGTH = 0
+}
+
 SECTIONS {
 	.start : {
 		bsp_section_start_begin = .;
@@ -424,6 +428,13 @@ SECTIONS {
 	.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }
 	/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }
 
-	/* Catch all unknown sections */
-	.nirvana : { *(*) } > NIRVANA
+	/*
+	 * This is a RTEMS specific section to catch all unexpected input
+	 * sections.  In case you get an error like
+	 *   "section `.unexpected_sections' will not fit in region
+	 *   `UNEXPECTED_SECTIONS'"
+	 * you have to figure out the offending input section and add it to the
+	 * appropriate output section definition above.
+	 */
+	.unexpected_sections : { *(*) } > UNEXPECTED_SECTIONS
 }
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds b/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds
index afd9270af8..2a14c80f96 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds
@@ -1,7 +1,6 @@
 MEMORY {
 	SDRAM_MMU : ORIGIN = 0x30000000, LENGTH = 16k
 	SDRAM : ORIGIN = 0x30004000, LENGTH = 64M - 16k
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", SDRAM);
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4 b/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4
index 823b60438e..a68846ec39 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4
+++ b/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4
@@ -1,7 +1,6 @@
 MEMORY {
 	RAM_INT : ORIGIN = 0x20000000, LENGTH = 128k
 	ROM_INT : ORIGIN = 0x00000000, LENGTH = 1M
-	NIRVANA : ORIGIN = 0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM_INT);
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.base b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.base
index 5458000ea2..4510df1668 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.base
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.base
@@ -26,6 +26,10 @@ RamBase = bsp_ram_start;
 RamSize = bsp_ram_size;
 HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
+MEMORY {
+	UNEXPECTED_SECTIONS : ORIGIN = 0xffffffff, LENGTH = 0
+}
+
 SECTIONS {
 	/*
 	 * BSP: MPC5200 registers
@@ -320,9 +324,12 @@ SECTIONS {
 	}
 
 	/*
-	 * BSP: Catch all unknown sections
+	 * This is a RTEMS specific section to catch all unexpected input
+	 * sections.  In case you get an error like
+	 *   "section `.unexpected_sections' will not fit in region
+	 *   `UNEXPECTED_SECTIONS'"
+	 * you have to figure out the offending input section and add it to the
+	 * appropriate output section definition above.
 	 */
-	.nirvana : {
-		*(*)
-	} > NIRVANA
+	.unexpected_sections : { *(*) } > UNEXPECTED_SECTIONS
 }
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l
index 40e57cae43..944cc36f4d 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l
@@ -10,7 +10,6 @@ MEMORY {
 	ROM : ORIGIN = 0xffe00000, LENGTH = 2M
 	DPRAM : ORIGIN = 0xff000000, LENGTH = 1k
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2 b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2
index 0aafdd7072..398919ae8c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2
@@ -10,7 +10,6 @@ MEMORY {
 	ROM : ORIGIN = 0xffe00000, LENGTH = 2M
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k
 	DPRAM : ORIGIN = 0x0, LENGTH = 0
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
index dc47f1b615..17c707fb49 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
@@ -10,7 +10,6 @@ MEMORY {
 	ROM : ORIGIN = 0xffe00000, LENGTH = 2M
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k
 	DPRAM : ORIGIN = 0x0, LENGTH = 0
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825 b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
index 83c2596fc4..55b987695c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
@@ -10,7 +10,6 @@ MEMORY {
 	ROM : ORIGIN = 0xffe00000, LENGTH = 2M
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k
 	DPRAM : ORIGIN = 0xff000000, LENGTH = 1k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30 b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
index 83c2596fc4..55b987695c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
@@ -10,7 +10,6 @@ MEMORY {
 	ROM : ORIGIN = 0xffe00000, LENGTH = 2M
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k
 	DPRAM : ORIGIN = 0xff000000, LENGTH = 1k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds
index 5f680246a2..9d7c4a8d36 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds
@@ -12,7 +12,6 @@ MEMORY {
 	RAM : ORIGIN = 0x0, LENGTH = 128M
 	ROM : ORIGIN = 0xfe000000, LENGTH = 8M
 	MPC83XX_REGS : ORIGIN = 0xe0000000, LENGTH = 256k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.base b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.base
index 6faeec1b70..9def5f0e88 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.base
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.base
@@ -22,6 +22,10 @@ RamBase = bsp_ram_start;
 RamSize = bsp_ram_size;
 HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
+MEMORY {
+	UNEXPECTED_SECTIONS : ORIGIN = 0xffffffff, LENGTH = 0
+}
+
 SECTIONS {
 	/*
 	 * BSP: MPC83XX registers
@@ -336,9 +340,12 @@ SECTIONS {
 	}
 
 	/*
-	 * BSP: Catch all unknown sections
+	 * This is a RTEMS specific section to catch all unexpected input
+	 * sections.  In case you get an error like
+	 *   "section `.unexpected_sections' will not fit in region
+	 *   `UNEXPECTED_SECTIONS'"
+	 * you have to figure out the offending input section and add it to the
+	 * appropriate output section definition above.
 	 */
-	.nirvana : {
-		*(*)
-	} > NIRVANA
+	.unexpected_sections : { *(*) } > UNEXPECTED_SECTIONS
 }
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.hsc_cm01 b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.hsc_cm01
index bbbf2ddbbd..021d2419d2 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.hsc_cm01
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.hsc_cm01
@@ -8,7 +8,6 @@ MEMORY {
 	RAM : ORIGIN = 0x0, LENGTH = 256M
 	ROM : ORIGIN = 0xfe000000, LENGTH = 8M
 	MPC83XX_REGS : ORIGIN = 0xe0000000, LENGTH = 1M
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8309som b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8309som
index 6f5e80137b..e2195b7259 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8309som
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8309som
@@ -8,7 +8,6 @@ MEMORY {
 	RAM : ORIGIN = 0x0, LENGTH = 256M
 	ROM : ORIGIN = 0xfe000000, LENGTH = 8M
 	MPC83XX_REGS : ORIGIN = 0xe0000000, LENGTH = 256k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8313erdb b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8313erdb
index 0898e95570..4a47c9d863 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8313erdb
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8313erdb
@@ -8,7 +8,6 @@ MEMORY {
 	RAM : ORIGIN = 0x0, LENGTH = 128M
 	ROM : ORIGIN = 0xfe000000, LENGTH = 8M
 	MPC83XX_REGS : ORIGIN = 0xe0000000, LENGTH = 256k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8349eamds b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8349eamds
index 7864bd023e..d140e073d2 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8349eamds
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8349eamds
@@ -8,7 +8,6 @@ MEMORY {
 	RAM : ORIGIN = 0x0, LENGTH = 256M
 	ROM : ORIGIN = 0xfe000000, LENGTH = 8M
 	MPC83XX_REGS : ORIGIN = 0xe0000000, LENGTH = 256k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.gwlcfm b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.gwlcfm
index 3f1bd3d9e4..391127f8c7 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.gwlcfm
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.gwlcfm
@@ -3,7 +3,6 @@ MEMORY {
 	RAM : ORIGIN = 0x40000000, LENGTH = 80K
 	RAM_EXT : ORIGIN = 0x20000000, LENGTH = 512K
 	NOCACHE : ORIGIN = 0x0, LENGTH = 0
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb
index 1989473d3d..12c6389642 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb
@@ -3,7 +3,6 @@ MEMORY {
 	RAM : ORIGIN = 0x40000000, LENGTH = 128K
 	RAM_EXT : ORIGIN = 0x20000000, LENGTH = 512K
 	NOCACHE : ORIGIN = 0x0, LENGTH = 0
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_evb b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_evb
index d0203be0d2..f9d2dc010c 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_evb
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_evb
@@ -4,7 +4,6 @@ MEMORY {
 	RAM_1 : ORIGIN = 0x50000000, LENGTH = 64K
 	RAM_EXT : ORIGIN = 0x0, LENGTH = 0
 	NOCACHE : ORIGIN = 0x0, LENGTH = 0
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 bsp_ram_1_start = ORIGIN (RAM_1);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb
index cb7c1ed7b0..5925207d4c 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb
@@ -3,7 +3,6 @@ MEMORY {
 	RAM : ORIGIN = 0x40000000, LENGTH = 256K - 16k
 	RAM_EXT : ORIGIN = 0x20000000, LENGTH = 512K
 	NOCACHE : ORIGIN = 0x4003c000, LENGTH = 16k
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", ROM);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.phycore_mpc5554 b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.phycore_mpc5554
index 18a0e8f44d..1db3190887 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.phycore_mpc5554
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.phycore_mpc5554
@@ -8,7 +8,6 @@ MEMORY {
 	RAM_EXT : ORIGIN = 0x21000000, LENGTH = 4M
 	DEBUG_RAM : ORIGIN = 0x21400000, LENGTH = 4M
 	NOCACHE : ORIGIN = 0x0, LENGTH = 0
-	NIRVANA : ORIGIN = 0x00000000, LENGTH = 0
 }
 
 bsp_debug_ram_start = ORIGIN (DEBUG_RAM);
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_0 b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_0
index d30d1c8f92..502a26ce58 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_0
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_0
@@ -7,7 +7,6 @@
 MEMORY {
 	LOW : ORIGIN = 0x4000, LENGTH = 16M - 16k
 	HIGH : ORIGIN = 0x1000000, LENGTH = 32M
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", LOW);
@@ -25,8 +24,8 @@ REGION_ALIAS ("REGION_BSS", HIGH);
 REGION_ALIAS ("REGION_RWEXTRA", HIGH);
 REGION_ALIAS ("REGION_WORK", HIGH);
 REGION_ALIAS ("REGION_STACK", HIGH);
-REGION_ALIAS ("REGION_NOCACHE", NIRVANA);
-REGION_ALIAS ("REGION_NOCACHE_LOAD", NIRVANA);
+REGION_ALIAS ("REGION_NOCACHE", HIGH);
+REGION_ALIAS ("REGION_NOCACHE_LOAD", HIGH);
 
 bsp_section_robarrier_align = 0x1000000;
 bsp_section_rwbarrier_align = 0x1000000;
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_1 b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_1
index 1bc021d2a5..82fadf71dd 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_1
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_1
@@ -6,7 +6,6 @@
 
 MEMORY {
 	RAM : ORIGIN = 0x4000000, LENGTH = 64M
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM);
@@ -24,8 +23,8 @@ REGION_ALIAS ("REGION_BSS", RAM);
 REGION_ALIAS ("REGION_RWEXTRA", RAM);
 REGION_ALIAS ("REGION_WORK", RAM);
 REGION_ALIAS ("REGION_STACK", RAM);
-REGION_ALIAS ("REGION_NOCACHE", NIRVANA);
-REGION_ALIAS ("REGION_NOCACHE_LOAD", NIRVANA);
+REGION_ALIAS ("REGION_NOCACHE", RAM);
+REGION_ALIAS ("REGION_NOCACHE_LOAD", RAM);
 
 bsp_section_robarrier_align = 0x1000000;
 bsp_section_rwbarrier_align = 0x1000000;
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_p1020rdb b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_p1020rdb
index 3543414a79..ef7fd575c5 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_p1020rdb
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_p1020rdb
@@ -7,7 +7,6 @@
 MEMORY {
 	LOW : ORIGIN = 0x4000, LENGTH = 16M - 16k
 	HIGH : ORIGIN = 0x1000000, LENGTH = 32M
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", LOW);
@@ -25,8 +24,8 @@ REGION_ALIAS ("REGION_BSS", HIGH);
 REGION_ALIAS ("REGION_RWEXTRA", HIGH);
 REGION_ALIAS ("REGION_WORK", HIGH);
 REGION_ALIAS ("REGION_STACK", HIGH);
-REGION_ALIAS ("REGION_NOCACHE", NIRVANA);
-REGION_ALIAS ("REGION_NOCACHE_LOAD", NIRVANA);
+REGION_ALIAS ("REGION_NOCACHE", HIGH);
+REGION_ALIAS ("REGION_NOCACHE_LOAD", HIGH);
 
 bsp_section_robarrier_align = 0x1000000;
 bsp_section_rwbarrier_align = 0x1000000;
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.base b/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.base
index 95453a9457..5c6f5e6cd6 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.base
+++ b/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.base
@@ -34,6 +34,10 @@ bsp_section_xbarrier_align = DEFINED (bsp_section_xbarrier_align) ? bsp_section_
 bsp_section_robarrier_align = DEFINED (bsp_section_robarrier_align) ? bsp_section_robarrier_align : 1;
 bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1;
 
+MEMORY {
+	UNEXPECTED_SECTIONS : ORIGIN = 0xffffffff, LENGTH = 0
+}
+
 SECTIONS {
 	.start : {
 		bsp_section_start_begin = .;
@@ -379,6 +383,13 @@ SECTIONS {
 	.PPC.EMB.apuinfo 0 : { *(.PPC.EMB.apuinfo) }
 	/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }
 
-	/* Catch all unknown sections */
-	.nirvana : { *(*) } > NIRVANA
+	/*
+	 * This is a RTEMS specific section to catch all unexpected input
+	 * sections.  In case you get an error like
+	 *   "section `.unexpected_sections' will not fit in region
+	 *   `UNEXPECTED_SECTIONS'"
+	 * you have to figure out the offending input section and add it to the
+	 * appropriate output section definition above.
+	 */
+	.unexpected_sections : { *(*) } > UNEXPECTED_SECTIONS
 }
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/startup/linkcmds.t32mppc b/c/src/lib/libbsp/powerpc/t32mppc/startup/linkcmds.t32mppc
index b4f6e98997..a73da78312 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/startup/linkcmds.t32mppc
+++ b/c/src/lib/libbsp/powerpc/t32mppc/startup/linkcmds.t32mppc
@@ -1,6 +1,5 @@
 MEMORY {
 	RAM : ORIGIN = 0x0, LENGTH = 128M
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 REGION_ALIAS ("REGION_START", RAM);
@@ -18,7 +17,7 @@ REGION_ALIAS ("REGION_BSS", RAM);
 REGION_ALIAS ("REGION_RWEXTRA", RAM);
 REGION_ALIAS ("REGION_WORK", RAM);
 REGION_ALIAS ("REGION_STACK", RAM);
-REGION_ALIAS ("REGION_NOCACHE", NIRVANA);
-REGION_ALIAS ("REGION_NOCACHE_LOAD", NIRVANA);
+REGION_ALIAS ("REGION_NOCACHE", RAM);
+REGION_ALIAS ("REGION_NOCACHE_LOAD", RAM);
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.base b/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.base
index c4a0eec115..0525e5c915 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.base
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.base
@@ -18,6 +18,10 @@ bsp_rom_size = LENGTH (ROM);
 
 bsp_section_align = 32;
 
+MEMORY {
+	UNEXPECTED_SECTIONS : ORIGIN = 0xffffffff, LENGTH = 0
+}
+
 SECTIONS {
 
 	dpram : 
@@ -306,11 +310,14 @@ SECTIONS {
 	/DISCARD/ : {
 		*(.note.GNU-stack) *(.gnu_debuglink)
 	}
-
+        
 	/*
-	 * BSP: Catch all unknown sections
+	 * This is a RTEMS specific section to catch all unexpected input
+	 * sections.  In case you get an error like
+	 *   "section `.unexpected_sections' will not fit in region
+	 *   `UNEXPECTED_SECTIONS'"
+	 * you have to figure out the offending input section and add it to the
+	 * appropriate output section definition above.
 	 */
-	.nirvana : {
-		*(*)
-	} > NIRVANA
+	.unexpected_sections : { *(*) } > UNEXPECTED_SECTIONS
 }
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx b/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx
index 69b9c32799..d5668b67be 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx
@@ -9,7 +9,6 @@ MEMORY {
 	RAM   : ORIGIN = 0x0, LENGTH = 128M
 	immr  : org = 0xfa200000,  l = 16K
 	ROM : ORIGIN = 0x40000000, LENGTH = 8M
-	NIRVANA : ORIGIN = 0x0, LENGTH = 0
 }
 
 INCLUDE linkcmds.base