diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
| commit | 3e4d27b06d7484040355e22eec2cbce7335d6dab (patch) | |
| tree | 9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /arch/arm/lib/bootm.c | |
| parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
| parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
| download | olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/arm/lib/bootm.c')
| -rw-r--r-- | arch/arm/lib/bootm.c | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 37476cc90..1bd273085 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -34,6 +34,7 @@  #include <libfdt.h>  #include <fdt_support.h>  #include <asm/bootm.h> +#include <linux/compiler.h>  DECLARE_GLOBAL_DATA_PTR; @@ -269,6 +270,8 @@ static int create_fdt(bootm_headers_t *images)  }  #endif +__weak void setup_board_tags(struct tag **in_params) {} +  /* Subcommand: PREP */  static void boot_prep_linux(bootm_headers_t *images)  { @@ -310,6 +313,7 @@ static void boot_prep_linux(bootm_headers_t *images)  			setup_initrd_tag(gd->bd, images->rd_start,  			images->rd_end);  #endif +		setup_board_tags(¶ms);  		setup_end_tag(gd->bd);  #else /* all tags */  		printf("FDT and ATAGS support not compiled in - hanging\n"); |