diff options
author | Tom Rini <trini@ti.com> | 2012-11-05 07:42:00 -0700 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2012-11-05 07:42:00 -0700 |
commit | 6acc7c3cbc05873d62118640cf964e9c9665804c (patch) | |
tree | 448da0bf67e0c4fa2ff033a67036ef96c7530697 /arch/arm/lib/bootm.c | |
parent | a6e8dcaf350fe8e780e29c57ececfece039725c7 (diff) | |
parent | 46d626d3926cf6b9f9c477782c5a0ee620a424cd (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
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 37476cc90d..1bd2730856 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"); |