diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:16 +0200 |
| commit | 5b7b7ee5d943c6b58d9b7f974167d0105ca1b787 (patch) | |
| tree | 5b01a8a5d8fa8f91f56547761df026adce9dabeb /arch/arm/lib | |
| parent | f1ee4e8b73a356278056666da8d0c6b5aa53088d (diff) | |
| parent | 07f93f54521c212558eb09adc812d97dffda443b (diff) | |
| download | barebox-5b7b7ee5d943c6b58d9b7f974167d0105ca1b787.tar.gz barebox-5b7b7ee5d943c6b58d9b7f974167d0105ca1b787.tar.xz | |
Merge branch 'for-next/metadata'
Conflicts:
arch/arm/dts/Makefile
common/Makefile
lib/Makefile
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/barebox.lds.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/bootm.c | 1 | ||||
| -rw-r--r-- | arch/arm/lib/pbl.lds.S | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/lib/barebox.lds.S b/arch/arm/lib/barebox.lds.S index d9588736f8..bb0354ae29 100644 --- a/arch/arm/lib/barebox.lds.S +++ b/arch/arm/lib/barebox.lds.S @@ -75,6 +75,8 @@ SECTIONS . = ALIGN(4); .data : { *(.data*) } + .barebox_imd : { BAREBOX_IMD } + . = .; __barebox_cmd_start = .; .barebox_cmd : { BAREBOX_CMDS } diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index ffd56edfd3..baf0946a47 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -6,6 +6,7 @@ #include <image.h> #include <init.h> #include <fs.h> +#include <libfile.h> #include <linux/list.h> #include <xfuncs.h> #include <malloc.h> diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S index 76184a0eec..9afee2964a 100644 --- a/arch/arm/lib/pbl.lds.S +++ b/arch/arm/lib/pbl.lds.S @@ -54,6 +54,8 @@ SECTIONS . = ALIGN(4); .rodata : { *(.rodata*) } + .barebox_imd : { BAREBOX_IMD } + _etext = .; /* End of text and rodata section */ . = ALIGN(4); |