summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-04-04 12:03:20 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-04-04 12:03:20 +0200
commitda718ca89d2a062bcb6047071c335eb19d028d78 (patch)
tree7e735083ab07fe73e7d0f2306a7dd388478725dc /arch/arm/include
parent71e001324bbcc5cd27666cf82e8ce043bf7d342e (diff)
parentbb289922763b9b46ab617fcd1be4ad6a6856d4a4 (diff)
downloadbarebox-da718ca89d2a062bcb6047071c335eb19d028d78.tar.gz
barebox-da718ca89d2a062bcb6047071c335eb19d028d78.tar.xz
Merge branch 'for-next/imx-external-nand-boot'
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/barebox-arm-head.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h
index 9d9b8549ea..9385415233 100644
--- a/arch/arm/include/asm/barebox-arm-head.h
+++ b/arch/arm/include/asm/barebox-arm-head.h
@@ -33,6 +33,13 @@ static inline void arm_cpu_lowlevel_init(void)
set_cr(r);
}
+/*
+ * 32 bytes at this offset is reserved in the barebox head for board/SoC
+ * usage
+ */
+#define ARM_HEAD_SPARE_OFS 0x30
+#define ARM_HEAD_SPARE_MARKER 0x55555555
+
#ifdef CONFIG_HAVE_MACH_ARM_HEAD
#include <mach/barebox-arm-head.h>
#else
@@ -64,6 +71,9 @@ static inline void barebox_arm_head(void)
* barebox can skip relocation
*/
".word _barebox_image_size\n" /* image size to copy */
+ ".rept 8\n"
+ ".word 0x55555555\n"
+ ".endr\n"
);
}
#endif