diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-04 10:31:14 +0200 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-04 10:31:14 +0200 |
| commit | 5c928b97fbc4b73d080a24c6a8ba4d855131252b (patch) | |
| tree | 8e52ece8932d2396b10388dbd5bb2788f949ce2f /board | |
| parent | 614830c8fd957dd4ac25a606ee53ae6855004a97 (diff) | |
| download | barebox-5c928b97fbc4b73d080a24c6a8ba4d855131252b.tar.gz barebox-5c928b97fbc4b73d080a24c6a8ba4d855131252b.tar.xz | |
Init IOMUX in any case
Move SDRAM-check after IOMUX init.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'board')
| -rw-r--r-- | board/pcm037/lowlevel_init.S | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/board/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S index a0926caa29..d05761fe6b 100644 --- a/board/pcm037/lowlevel_init.S +++ b/board/pcm037/lowlevel_init.S @@ -65,15 +65,6 @@ board_init_lowlevel: writel(IMX_PLL_PD(0) | IMX_PLL_MFD(0xe) | IMX_PLL_MFI(9) | IMX_PLL_MFN(0xd), IMX_CCM_BASE + CCM_MPCTL) writel(IMX_PLL_PD(1) | IMX_PLL_MFD(0x43) | IMX_PLL_MFI(12) | IMX_PLL_MFN(1), IMX_CCM_BASE + CCM_SPCTL) - /* Skip SDRAM initialization if we run from RAM */ - cmp pc, #0x80000000 - bls 1f - cmp pc, #0x90000000 - bhi 1f - - mov pc, lr - -1: /* Configure IOMUXC */ writel(0, 0x43FAC26C)/* SDCLK */ writel(0, 0x43FAC270) /* CAS */ @@ -103,6 +94,16 @@ board_init_lowlevel: writel(0, 0x43FAC2D8) writel(0, 0x43FAC2DC) + /* Skip SDRAM initialization if we run from RAM */ + cmp pc, #0x80000000 + bls 1f + cmp pc, #0x90000000 + bhi 1f + + mov pc, lr + +1: + #if defined CONFIG_PCM037_SDRAM_BANK0_128MB #define ROWS0 ESDCTL0_ROW13 #elif defined CONFIG_PCM037_SDRAM_BANK0_256MB |