diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:19:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:19:30 +0200 |
| commit | 638e059aba994dc8a77f81ad5e826f1706aecc00 (patch) | |
| tree | a4c860240169dd1acbae19d4f83822073d34a177 /arch/arm/boards/guf-neso | |
| parent | 90d92b359de4e5c52a1ff0b9272b5005484e7941 (diff) | |
| parent | faf7b7af6e51a33b88453821d792c89a84f72b1d (diff) | |
| download | barebox-638e059aba994dc8a77f81ad5e826f1706aecc00.tar.gz barebox-638e059aba994dc8a77f81ad5e826f1706aecc00.tar.xz | |
Merge branch 'for-next/arm-board-reset'
Conflicts:
arch/arm/cpu/start-reset.c
arch/arm/include/asm/barebox-arm.h
arch/arm/mach-omap/Kconfig
arch/arm/mach-omap/omap3_core.S
Diffstat (limited to 'arch/arm/boards/guf-neso')
| -rw-r--r-- | arch/arm/boards/guf-neso/lowlevel.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boards/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c index e6059fe445..2d57990773 100644 --- a/arch/arm/boards/guf-neso/lowlevel.c +++ b/arch/arm/boards/guf-neso/lowlevel.c @@ -25,6 +25,7 @@ #include <io.h> #include <mach/imx-nand.h> #include <asm/barebox-arm.h> +#include <asm/barebox-arm-head.h> #include <asm/system.h> #include <asm-generic/sections.h> #include <asm-generic/memory_layout.h> @@ -48,13 +49,16 @@ static void __bare_init __naked insdram(void) #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10) -void __bare_init __naked board_init_lowlevel(void) +void __bare_init __naked reset(void) { uint32_t r; int i; #ifdef CONFIG_NAND_IMX_BOOT unsigned int *trg, *src; #endif + + common_reset(); + /* ahb lite ip interface */ AIPI1_PSR0 = 0x20040304; AIPI1_PSR1 = 0xDFFBFCFB; |