diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-15 14:50:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-20 16:55:44 +0100 |
| commit | 6345f19af57b95abb2cab6de5f522f23dfce598e (patch) | |
| tree | b8115f652f87f9f3e67028b8715a732d3b3d277c /arch/arm/boards/guf-neso | |
| parent | 6e45abe47ece9052956afcda8331fd50a2500e96 (diff) | |
| download | barebox-6345f19af57b95abb2cab6de5f522f23dfce598e.tar.gz barebox-6345f19af57b95abb2cab6de5f522f23dfce598e.tar.xz | |
ARM i.MX boards: use helper function for external NAND boot
Use helper function for external NAND boot to get some positive
diffstat.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/guf-neso')
| -rw-r--r-- | arch/arm/boards/guf-neso/lowlevel.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/arch/arm/boards/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c index ad414d9208..7a366d908c 100644 --- a/arch/arm/boards/guf-neso/lowlevel.c +++ b/arch/arm/boards/guf-neso/lowlevel.c @@ -30,27 +30,12 @@ #include <asm-generic/sections.h> #include <asm-generic/memory_layout.h> -#ifdef CONFIG_NAND_IMX_BOOT -static void __bare_init __naked insdram(void) -{ - /* setup a stack to be able to call imx_nand_load_image() */ - arm_setup_stack(STACK_BASE + STACK_SIZE - 12); - - imx_nand_load_image(_text, barebox_image_size); - - board_init_lowlevel_return(); -} -#endif - #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10) void __bare_init __naked reset(void) { uint32_t r; int i; -#ifdef CONFIG_NAND_IMX_BOOT - unsigned int *trg, *src; -#endif common_reset(); @@ -102,23 +87,11 @@ void __bare_init __naked reset(void) MX27_ESDCTL_BASE_ADDR + IMX_ESDCTL0); #ifdef CONFIG_NAND_IMX_BOOT - /* skip NAND boot if not running from NFC space */ - r = get_pc(); - if (r < MX27_NFC_BASE_ADDR || r > MX27_NFC_BASE_ADDR + 0x800) - board_init_lowlevel_return(); - - src = (unsigned int *)MX27_NFC_BASE_ADDR; - trg = (unsigned int *)_text; - - /* Move ourselves out of NFC SRAM */ - for (i = 0; i < 0x800 / sizeof(int); i++) - *trg++ = *src++; + /* setup a stack to be able to call imx27_barebox_boot_nand_external() */ + arm_setup_stack(STACK_BASE + STACK_SIZE - 12); - /* Jump to SDRAM */ - r = (unsigned int)&insdram; - __asm__ __volatile__("mov pc, %0" : : "r"(r)); + imx27_barebox_boot_nand_external(); #else board_init_lowlevel_return(); #endif } - |