summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/pcm038
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-14 22:13:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:52:39 +0100
commitf2a8e3589857da84a9cc91267e86d6f9b542a72d (patch)
treec8608263fb648ed97648d3f7a8b00c08f6ca80a9 /arch/arm/boards/pcm038
parentcf4271ee12f8ce61598a327a72026226441dca72 (diff)
downloadbarebox-f2a8e3589857da84a9cc91267e86d6f9b542a72d.tar.gz
barebox-f2a8e3589857da84a9cc91267e86d6f9b542a72d.tar.xz
ARM i.MX boards: switch to barebox_arm_entry
Most i.MX boards can use the imx*_barebox_entry functions. The remaining (i.MX21, i.MX6) use hardcoded base addresses. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/pcm038')
-rw-r--r--arch/arm/boards/pcm038/lowlevel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boards/pcm038/lowlevel.c b/arch/arm/boards/pcm038/lowlevel.c
index aecdbf3e30..c00b3b49a0 100644
--- a/arch/arm/boards/pcm038/lowlevel.c
+++ b/arch/arm/boards/pcm038/lowlevel.c
@@ -49,7 +49,7 @@ void __bare_init __naked reset(void)
/* Skip SDRAM initialization if we run from RAM */
r = get_pc();
if (r > 0xa0000000 && r < 0xb0000000)
- board_init_lowlevel_return();
+ goto out;
/* re-program the PLL prior(!) starting the SDRAM controller */
writel(MPCTL0_VAL, MX27_CCM_BASE_ADDR + MX27_MPCTL0);
@@ -99,6 +99,8 @@ void __bare_init __naked reset(void)
imx27_barebox_boot_nand_external();
#else
- board_init_lowlevel_return();
+ imx27_barebox_entry(0);
#endif
+out:
+ imx27_barebox_entry(0);
}