diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-03 10:05:22 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-03 10:05:22 +0100 |
| commit | a42c87f9d831c4eb36104255766cc7897876867c (patch) | |
| tree | 90dd6a5dad0e7e290d7df44cff746fb3319b3219 /arch/arm/lib | |
| parent | d598e0fe739e5a75db74cc144beabd09e3c51433 (diff) | |
| parent | a956bdcb3ff759f753e3f0c5e40e58f4c3056e22 (diff) | |
| download | u-boot-imx-a42c87f9d831c4eb36104255766cc7897876867c.zip u-boot-imx-a42c87f9d831c4eb36104255766cc7897876867c.tar.gz u-boot-imx-a42c87f9d831c4eb36104255766cc7897876867c.tar.bz2 | |
Merge remote-tracking branch 'u-boot-ti/master'
Diffstat (limited to 'arch/arm/lib')
| -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 37476cc..1bd2730 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"); |