From 64476d2177a53228319c4ab5b99cfb66ec8cc365 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 4 Apr 2011 10:51:47 +0200 Subject: ARM: compile in image size and magic into barebox image This is useful to detect a barebox image and to be able to copy only the image size if barebox is stored on raw partitions which are bigger than the image. Signed-off-by: Sascha Hauer --- arch/arm/cpu/start.c | 6 ++++++ arch/arm/lib/barebox.lds.S | 1 + include/asm-generic/sections.h | 3 +++ 3 files changed, 10 insertions(+) diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index 1f8eed8a4f..f20ce74aca 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -48,6 +48,12 @@ void __naked __section(.text_entry) exception_vectors(void) "1: bne 1b\n" /* irq (interrupt) */ "1: bne 1b\n" /* fiq (fast interrupt) */ #endif + ".word 0x65726162\n" /* 'bare' */ + ".word 0x00786f62\n" /* 'box' */ + ".word _text\n" /* text base. If copied there, + * barebox can skip relocation + */ + ".word _barebox_image_size\n" /* image size to copy */ ); } diff --git a/arch/arm/lib/barebox.lds.S b/arch/arm/lib/barebox.lds.S index 7683f739eb..81a91236c0 100644 --- a/arch/arm/lib/barebox.lds.S +++ b/arch/arm/lib/barebox.lds.S @@ -93,4 +93,5 @@ SECTIONS .bss : { *(.bss*) } __bss_stop = .; _end = .; + _barebox_image_size = __bss_start - _text; } diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index c5d60a9d75..1f48fb8c6b 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -4,5 +4,8 @@ extern char _text[], _stext[], _etext[]; extern char __bss_start[], __bss_stop[]; extern char _end[]; +extern void *_barebox_image_size; + +#define barebox_image_size (unsigned int)&_barebox_image_size #endif /* _ASM_GENERIC_SECTIONS_H_ */ -- cgit v1.2.3