3 files changed, 4 insertions, 23 deletions
diff --git a/bsps/powerpc/haleakala/start/bspstart.c b/bsps/powerpc/haleakala/start/bspstart.c
index 5f7f5efb95..986582955a 100644
--- a/bsps/powerpc/haleakala/start/bspstart.c
+++ b/bsps/powerpc/haleakala/start/bspstart.c
@@ -66,9 +66,6 @@
 #include <ppc4xx/ppc405ex.h>
 
 #include <stdio.h>
-
-LINKER_SYMBOL(intrStack_start);
-LINKER_SYMBOL(intrStack_size);
 /*
  *  Driver configuration parameters
  */
@@ -188,8 +185,8 @@ void bsp_start( void )
    * Initialize default raw exception handlers.
    */
   ppc_exc_initialize(
-    (uintptr_t) intrStack_start,
-    (uintptr_t) intrStack_size
+    (uintptr_t) _Configuration_Interrupt_stack_area_begin,
+    rtems_configuration_get_interrupt_stack_size()
   );
 
   /*
diff --git a/bsps/powerpc/haleakala/start/dlentry.S b/bsps/powerpc/haleakala/start/dlentry.S
index 2395d89886..54fbb7668b 100644
--- a/bsps/powerpc/haleakala/start/dlentry.S
+++ b/bsps/powerpc/haleakala/start/dlentry.S
@@ -54,7 +54,7 @@
  *    .bss
  * see linker command file for section placement
  *
- *  The initial stack is set to stack.end
+ *  The initial stack is set to _Configuration_Interrupt_stack_area_end.
  *
  *  All the entry veneer has to do is to clear the BSS.
  */
@@ -98,7 +98,7 @@ sbss_length:
 sbss_addr:
 		.long	sbss.start
 stack_top:
-		.long	stack.end
+		.long	_Configuration_Interrupt_stack_area_end
 PUBLIC_VAR (text_addr)
 text_addr:
         .long   text.start
diff --git a/bsps/powerpc/haleakala/start/linkcmds b/bsps/powerpc/haleakala/start/linkcmds
index 98fea7f990..3bccc97c38 100644
--- a/bsps/powerpc/haleakala/start/linkcmds
+++ b/bsps/powerpc/haleakala/start/linkcmds
@@ -14,9 +14,6 @@ OUTPUT_ARCH(powerpc)
 ENTRY(download_entry)
 EXTERN(__vectors)
 
-kIntrStackSize = 16K;
-kMainStackSize = 64K;
-
 RamBase = DEFINED(RamBase) ? RamBase : 0;
 RamSize = DEFINED(RamSize) ? RamSize : 256M;
 HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
@@ -246,19 +243,6 @@ SECTIONS
 
     bss.size = bss.end - bss.start;
     sbss.size = sbss.end - sbss.start;
-	          	
-    /* Interrupt stack: align to a cache-line boundary */
-    IntrStack_start = ALIGN(0x20);
-    . += kIntrStackSize;
-    intrStack = .;
-    PROVIDE(intrStackPtr = intrStack);
-    PROVIDE(intrStack_start = IntrStack_start);
-    PROVIDE(intrStack_size = kIntrStackSize);
-
- 	/* Main stack: align to a cache-line boundary */
-	stack.start = ALIGN(0x20);
-	. += kMainStackSize;
-	stack.end   = .;
 
     .rtemsstack (NOLOAD) : {
         *(SORT(.rtemsstack.*))