commit fcecc4c9890babb3b1da89223c001cbb15fe3ac3
author Stephen McGruer <smcgruer@google.com> Wed Aug 06 21:30:26 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 05 00:40:01 2014 +0000
tree cd8441a5671c13a852f46e99c6569152a5065bb1
parent c57b764ee29c101086011633131bd8d9062a96b3
parent b13475e70c343c65a2b6ebe20849cad6f3fa29c7

Merge "Move TEMP_STACK to STACK_BASE for barebox"

arch/arm/mach-comcerto/include/mach/comcerto-2000.h

diff --git a/arch/arm/mach-comcerto/include/mach/comcerto-2000.h b/arch/arm/mach-comcerto/include/mach/comcerto-2000.h
index 59874a3..42b6380 100644
--- a/arch/arm/mach-comcerto/include/mach/comcerto-2000.h
+++ b/arch/arm/mach-comcerto/include/mach/comcerto-2000.h
@@ -21,6 +21,8 @@
 #ifndef __COMCERTO_2000_H__
 #define __COMCERTO_2000_H__
 
+#include <asm-generic/memory_layout.h>
+
 /*
  * IRAM Location to keep C2K Part Number.
  * This location should be fixed and can not be changed.
@@ -132,7 +134,7 @@
 
 #define COMCERTO_SERDES_REG( _num, _ofst) ((COMCERTO_APB_SERDES_BASE + (0x4000 * _num)) + _ofst)
 
-#define TEMP_STACK     0x8300C000
+#define TEMP_STACK     STACK_BASE + STACK_SIZE - 16
 
 #define UART_BASEADDR	0x96400000