diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-21 15:56:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-16 08:45:37 +0200 |
| commit | dbd47524f4f3facaf8269ae001c6d3efd76fea4b (patch) | |
| tree | 7d1536d40d61d53a734c6ff40a77bc90418af32c /arch/arm/mach-mvebu | |
| parent | f8761636f23a989ae877b446866ef289420b10f4 (diff) | |
| download | barebox-dbd47524f4f3facaf8269ae001c6d3efd76fea4b.tar.gz barebox-dbd47524f4f3facaf8269ae001c6d3efd76fea4b.tar.xz | |
ARM: mvebu: introduce multi image support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/common.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/lowlevel.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/lowlevel.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 3c38642ec2..8bb2eade22 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -88,6 +88,7 @@ choice config MACH_SOLIDRUN_CUBOX bool "SolidRun CuBox" + select HAVE_PBL_MULTI_IMAGES endchoice diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 80b3947cc8..6e303663ca 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,5 +1,5 @@ lwl-y += lowlevel.o -obj-y += common.o +lwl-y += common.o obj-$(CONFIG_ARCH_ARMADA_370) += armada-370-xp.o obj-$(CONFIG_ARCH_ARMADA_XP) += armada-370-xp.o obj-$(CONFIG_ARCH_DOVE) += dove.o diff --git a/arch/arm/mach-mvebu/common.c b/arch/arm/mach-mvebu/common.c index e2092c8705..921b5150f6 100644 --- a/arch/arm/mach-mvebu/common.c +++ b/arch/arm/mach-mvebu/common.c @@ -49,9 +49,9 @@ static void mvebu_remap_registers(void) #define MVEBU_BOOTUP_MEMORY_BASE 0x00000000 #define MVEBU_BOOTUP_MEMORY_SIZE SZ_64M -void __naked __noreturn mvebu_barebox_entry(void) +void __naked __noreturn mvebu_barebox_entry(uint32_t boarddata) { mvebu_remap_registers(); barebox_arm_entry(MVEBU_BOOTUP_MEMORY_BASE, - MVEBU_BOOTUP_MEMORY_SIZE, 0); + MVEBU_BOOTUP_MEMORY_SIZE, boarddata); } diff --git a/arch/arm/mach-mvebu/include/mach/lowlevel.h b/arch/arm/mach-mvebu/include/mach/lowlevel.h index e86d928f63..9fbf1eaf45 100644 --- a/arch/arm/mach-mvebu/include/mach/lowlevel.h +++ b/arch/arm/mach-mvebu/include/mach/lowlevel.h @@ -18,6 +18,6 @@ #ifndef __MACH_LOWLEVEL_H__ #define __MACH_LOWLEVEL_H__ -void mvebu_barebox_entry(void); +void mvebu_barebox_entry(uint32_t boarddata); #endif diff --git a/arch/arm/mach-mvebu/lowlevel.c b/arch/arm/mach-mvebu/lowlevel.c index 3f64c4a5b4..11810cc6b5 100644 --- a/arch/arm/mach-mvebu/lowlevel.c +++ b/arch/arm/mach-mvebu/lowlevel.c @@ -24,5 +24,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - mvebu_barebox_entry(); + mvebu_barebox_entry(0); } |