From a8c7c708a9e0051c6358718c53572a4681eaa22b Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sat, 6 Dec 2003 19:49:23 +0000
Subject: * Patch by Gleb Natapov, 19 Sep 2003:   Move most of the timer
 interrupt related PPC code to ppc_lib/interrupts.c

* Patch by Anders Larsen, 17 Sep 2003:
  Bring ARM memory layout in sync with the documentation:
  stack and malloc-heap are now located _below_ the U-Boot code
---
 cpu/at91rm9200/cpu.c   | 18 ++++++++----------
 cpu/at91rm9200/start.S | 22 ++++++++++------------
 2 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'cpu/at91rm9200')

diff --git a/cpu/at91rm9200/cpu.c b/cpu/at91rm9200/cpu.c
index 262ca34..b0cfcef 100644
--- a/cpu/at91rm9200/cpu.c
+++ b/cpu/at91rm9200/cpu.c
@@ -81,18 +81,16 @@ static void cp_delay(void)
 
 int cpu_init(void)
 {
-    /*
-     * setup up stack if necessary
-     */
+	/*
+	 * setup up stacks if necessary
+	 */
 #ifdef CONFIG_USE_IRQ
-    IRQ_STACK_START = _armboot_end +
-			CONFIG_STACKSIZE + CONFIG_STACKSIZE_IRQ - 4;
-    FIQ_STACK_START = IRQ_STACK_START + CONFIG_STACKSIZE_FIQ;
-    _armboot_real_end = FIQ_STACK_START + 4;
-#else
-    _armboot_real_end = _armboot_end + CONFIG_STACKSIZE;
+	DECLARE_GLOBAL_DATA_PTR;
+
+	IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_LEN - 4;
+	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 #endif
-    return 0;
+	return 0;
 }
 
 int cleanup_before_linux(void)
diff --git a/cpu/at91rm9200/start.S b/cpu/at91rm9200/start.S
index 9fa1461..a93d045 100644
--- a/cpu/at91rm9200/start.S
+++ b/cpu/at91rm9200/start.S
@@ -93,14 +93,6 @@ _armboot_end_data:
 _armboot_end:
 	.word armboot_end
 
-/*
- * _armboot_real_end is the first usable RAM address behind armboot
- * and the various stacks
- */
-.globl _armboot_real_end
-_armboot_real_end:
-	.word 0x0badc0de
-
 #ifdef CONFIG_USE_IRQ
 /* IRQ stack memory (calculated at run-time) */
 .globl IRQ_STACK_START
@@ -147,10 +139,16 @@ copyex:
 	bl      cpu_init_crit
 #endif
 
-	/* set up the stack */
-	ldr     r0, _armboot_end
-	add     r0, r0, #CONFIG_STACKSIZE
-	sub     sp, r0, #12             /* leave 3 words for abort-stack */
+	/* Set up the stack						    */
+stack_setup:
+	ldr	r0, _TEXT_BASE		/* upper 128 KiB: relocated uboot   */
+	sub	r0, r0, #CFG_MALLOC_LEN	/* malloc area                      */
+	sub	r0, r0, #CFG_GBL_DATA_SIZE /* bdinfo                        */
+#ifdef CONFIG_USE_IRQ
+	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
+#endif
+	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+
 	ldr pc,_start_armboot
 
 _start_armboot: .word start_armboot
-- 
cgit v1.1