diff options
| author | Ivo Clarysse <ivo.clarysse@gmail.com> | 2010-03-22 15:59:36 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-03-31 08:25:30 +0200 |
| commit | d15dd50c5cacaf4652a6aff849e63e1a98f7c34a (patch) | |
| tree | 8980a0f4409d4ea0a9c56b1be91ac9cb43c94fc4 /board | |
| parent | 0b54f2cdb17bbf9fa74c1b4c109275ddb14e6803 (diff) | |
| download | barebox-d15dd50c5cacaf4652a6aff849e63e1a98f7c34a.tar.gz barebox-d15dd50c5cacaf4652a6aff849e63e1a98f7c34a.tar.xz | |
MX21ADS: Support booting from NAND
Support booting an MX21ADS system from NAND.
Signed-off-by: Ivo Clarysse <ivo.clarysse@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'board')
| -rw-r--r-- | board/imx21ads/imx21ads.c | 9 | ||||
| -rw-r--r-- | board/imx21ads/lowlevel_init.S | 50 |
2 files changed, 57 insertions, 2 deletions
diff --git a/board/imx21ads/imx21ads.c b/board/imx21ads/imx21ads.c index 88dcfb296e..bc638e3baf 100644 --- a/board/imx21ads/imx21ads.c +++ b/board/imx21ads/imx21ads.c @@ -148,3 +148,12 @@ static int mx21ads_console_init(void) } console_initcall(mx21ads_console_init); + +#ifdef CONFIG_NAND_IMX_BOOT +void __bare_init nand_boot(void) +{ + PCCR0 |= PCCR0_NFC_EN; + imx_nand_load_image((void *)TEXT_BASE, 256 * 1024); +} +#endif + diff --git a/board/imx21ads/lowlevel_init.S b/board/imx21ads/lowlevel_init.S index 1705d7928a..607da27476 100644 --- a/board/imx21ads/lowlevel_init.S +++ b/board/imx21ads/lowlevel_init.S @@ -20,12 +20,13 @@ #include <config.h> #include <mach/imx-regs.h> + .section ".text_bare_init","ax" .globl board_init_lowlevel board_init_lowlevel: /* Save lr, because it is overwritten by the calls to mem_delay. */ - mov r5, lr + mov r10, lr /* * Initialize the AHB-Lite IP Interface (AIPI) module (to enable access to @@ -71,6 +72,15 @@ board_init_lowlevel: ldr r1, =0xffffffc9 str r1, [r0] + /* Skip SDRAM initialization if we run from RAM */ + cmp pc, #0xc0000000 + bls 1f + cmp pc, #0xc8000000 + bhi 1f + + mov pc, r10 +1: + /* Precharge */ ldr r0, =SDCTL0 ldr r1, =0x92120300 @@ -105,7 +115,43 @@ board_init_lowlevel: ldr r1, =0x8212F339 str r1, [r0] - mov pc, r5 + /* Set NFC_CLK to 24MHz */ + ldr r0, =PCDR0 + ldr r1, =0x6419a007 + str r1, [r0] + +#ifdef CONFIG_NAND_IMX_BOOT + ldr sp, =TEXT_BASE - 4 /* Setup a temporary stack in SDRAM */ + + ldr r0, =IMX_NFC_BASE /* start of NFC SRAM */ + ldr r2, =IMX_NFC_BASE + 0x800 /* end of NFC SRAM */ + + /* skip NAND boot if not running from NFC space */ + cmp pc, r0 + bls ret + cmp pc, r2 + bhi ret + + /* Move ourselves out of NFC SRAM */ + ldr r1, =TEXT_BASE + +copy_loop: + ldmia r0!, {r3-r9} /* copy from source address [r0] */ + stmia r1!, {r3-r9} /* copy to target address [r1] */ + cmp r0, r2 /* until source end addreee [r2] */ + ble copy_loop + + ldr pc, =1f /* Jump to SDRAM */ +1: + bl nand_boot /* Load barebox from NAND Flash */ + + ldr r1, =IMX_NFC_BASE - TEXT_BASE + sub r10, r10, r1 /* adjust return address from NFC */ + /* SRAM to SDRAM */ +#endif /* CONFIG_NAND_IMX_BOOT */ + +ret: + mov pc, r10 /* * spin for a while. we need to wait at least 200 usecs. |