diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:40:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:40:04 +0200 |
| commit | 7f6b6d25d899fea83412255d1d819e3b6450f144 (patch) | |
| tree | 4da546d3b4045c842af7ccad3004c6476cb4d523 /arch/arm/boards/panda | |
| parent | 1729b1798e1bfd4614a9cf7cf651cee8b6923283 (diff) | |
| parent | f1cf4433bfc2d2e7bfdab8eacc401a0ccf2fe08d (diff) | |
| download | barebox-7f6b6d25d899fea83412255d1d819e3b6450f144.tar.gz barebox-7f6b6d25d899fea83412255d1d819e3b6450f144.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/pcm051/env/config
Diffstat (limited to 'arch/arm/boards/panda')
| -rw-r--r-- | arch/arm/boards/panda/lowlevel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boards/panda/lowlevel.c b/arch/arm/boards/panda/lowlevel.c index a21d55928c..205aaaf817 100644 --- a/arch/arm/boards/panda/lowlevel.c +++ b/arch/arm/boards/panda/lowlevel.c @@ -23,6 +23,7 @@ #include <mach/generic.h> #include <mach/omap4-mux.h> #include <mach/omap4-silicon.h> +#include <mach/omap4-generic.h> #include <mach/omap4-clock.h> #include <mach/syslib.h> #include <asm/barebox-arm.h> @@ -80,7 +81,7 @@ static void noinline panda_init_lowlevel(void) void __bare_init __naked barebox_arm_reset_vector(uint32_t *data) { - omap_save_bootinfo(); + omap4_save_bootinfo(data); arm_cpu_lowlevel_init(); |