X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Farm1136%2Fcpu.c;h=04861632e1b3fa679ff3530b33b5ee553a490c7d;hb=3111d32c494e8251b90917447796a7206b757e1e;hp=85a48491b35b7f68b9e09ec866989dd810bf3eb7;hpb=cbdf8824faaeab6f989bee60443987ef6272e77a;p=oweals%2Fu-boot.git

diff --git a/cpu/arm1136/cpu.c b/cpu/arm1136/cpu.c
index 85a48491b3..04861632e1 100644
--- a/cpu/arm1136/cpu.c
+++ b/cpu/arm1136/cpu.c
@@ -33,8 +33,9 @@
 
 #include <common.h>
 #include <command.h>
-#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
-#include <asm/arch/omap2420.h>
+
+#ifdef CONFIG_USE_IRQ
+DECLARE_GLOBAL_DATA_PTR;
 #endif
 
 /* read co-processor 15, register #1 (control register) */
@@ -43,10 +44,10 @@ static unsigned long read_p15_c1 (void)
 	unsigned long value;
 
 	__asm__ __volatile__(
-						"mrc	p15, 0, %0, c1, c0, 0   @ read control reg\n"
-						: "=r" (value)
-						:
-						: "memory");
+				"mrc	p15, 0, %0, c1, c0, 0   @ read control reg\n"
+				: "=r" (value)
+				:
+				: "memory");
 	return value;
 }
 
@@ -88,9 +89,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_SIZE - 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;