diff options
author | Peter Pearse <peter.pearse@arm.com> | 2008-02-15 12:59:15 +0000 |
---|---|---|
committer | Peter Pearse <peter.pearse@arm.com> | 2008-02-15 12:59:15 +0000 |
commit | ae92069abecc278d7b8de88ffa62de0c2c0ed2bf (patch) | |
tree | 2509461053fa9e58c6d2b4750727f07b646965d8 /cpu/arm926ejs/start.S | |
parent | e42d2b0479ff5fd9f041e8dfa52105d521fa9264 (diff) | |
parent | 9604b6e53ddae4fe00a488cbcd6b0e6cb344bccc (diff) | |
download | u-boot-imx-ae92069abecc278d7b8de88ffa62de0c2c0ed2bf.zip u-boot-imx-ae92069abecc278d7b8de88ffa62de0c2c0ed2bf.tar.gz u-boot-imx-ae92069abecc278d7b8de88ffa62de0c2c0ed2bf.tar.bz2 |
Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdev
Diffstat (limited to 'cpu/arm926ejs/start.S')
-rw-r--r-- | cpu/arm926ejs/start.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpu/arm926ejs/start.S b/cpu/arm926ejs/start.S index 725c663..297efe0 100644 --- a/cpu/arm926ejs/start.S +++ b/cpu/arm926ejs/start.S @@ -182,6 +182,9 @@ clbss_l:str r2, [r0] /* clear loop... */ cmp r0, r1 ble clbss_l + bl coloured_LED_init + bl red_LED_on + ldr pc, _start_armboot _start_armboot: @@ -198,8 +201,7 @@ _start_armboot: * ************************************************************************* */ - - +#ifndef CONFIG_SKIP_LOWLEVEL_INIT cpu_init_crit: /* * flush v4 I/D caches @@ -225,6 +227,8 @@ cpu_init_crit: bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ + /* ************************************************************************* * |