X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Farm925t%2Fcpu.c;h=b9f09318ad52cb2189b46db763a527052bef0f73;hb=89c00fb15859213788f0ad089934c376fb356099;hp=6bac53da824e6a12c6b7a8c402e9ede56741778e;hpb=a8c7c708a9e0051c6358718c53572a4681eaa22b;p=oweals%2Fu-boot.git

diff --git a/cpu/arm925t/cpu.c b/cpu/arm925t/cpu.c
index 6bac53da82..b9f09318ad 100644
--- a/cpu/arm925t/cpu.c
+++ b/cpu/arm925t/cpu.c
@@ -33,6 +33,10 @@
 #include <command.h>
 #include <arm925t.h>
 
+#ifdef CONFIG_USE_IRQ
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
 /* read co-processor 15, register #1 (control register) */
 static unsigned long read_p15_c1 (void)
 {
@@ -91,9 +95,7 @@ int cpu_init (void)
 	 * setup up stacks if necessary
 	 */
 #ifdef CONFIG_USE_IRQ
-	DECLARE_GLOBAL_DATA_PTR;
-
-	IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_LEN - 4;
+	IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
 	FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 #endif
 	return 0;
@@ -125,8 +127,6 @@ int cleanup_before_linux (void)
 
 int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-	extern void reset_cpu (ulong addr);
-
 	disable_interrupts ();
 	reset_cpu (0);
 	/*NOTREACHED*/