mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-23 07:31:32 +00:00
Remove unneeded INIT_RAM_LOCK cache twiddling.
Correctly tracks r29 as global data pointer now. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
This commit is contained in:
parent
d4dd317b58
commit
6cfea33477
4 changed files with 6 additions and 16 deletions
|
@ -291,16 +291,5 @@ ft_board_setup(void *blob, bd_t *bd)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
|
||||||
after_reloc(ulong dest_addr)
|
|
||||||
{
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
|
||||||
|
|
||||||
/* now, jump to the main U-Boot board init code */
|
|
||||||
board_init_r ((gd_t *)gd, dest_addr);
|
|
||||||
|
|
||||||
/* NOTREACHED */
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -809,7 +809,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
||||||
|
|
||||||
#ifndef CONFIG_OF_FLAT_TREE
|
#ifndef CONFIG_OF_FLAT_TREE
|
||||||
|
|
||||||
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
|
#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500) || !defined(CONFIG_MPC86xx))
|
||||||
unlock_ram_in_cache();
|
unlock_ram_in_cache();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -827,7 +827,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
||||||
ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd, initrd_start, initrd_end);
|
ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd, initrd_start, initrd_end);
|
||||||
/* ft_dump_blob(of_flat_tree); */
|
/* ft_dump_blob(of_flat_tree); */
|
||||||
|
|
||||||
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
|
#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500)||!defined(CONFIG_MPC86xx))
|
||||||
unlock_ram_in_cache();
|
unlock_ram_in_cache();
|
||||||
#endif
|
#endif
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -955,8 +955,9 @@ in_ram:
|
||||||
cmplw 0, r3, r4
|
cmplw 0, r3, r4
|
||||||
bne 5b
|
bne 5b
|
||||||
6:
|
6:
|
||||||
mr r3, r10 /* Destination Address */
|
mr r3, r9 /* Init Date pointer */
|
||||||
bl after_reloc
|
mr r4, r10 /* Destination Address */
|
||||||
|
bl board_init_r
|
||||||
|
|
||||||
/* not reached - end relocate_code */
|
/* not reached - end relocate_code */
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
|
|
|
@ -676,7 +676,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
||||||
icache_enable (); /* it's time to enable the instruction cache */
|
icache_enable (); /* it's time to enable the instruction cache */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CFG_INIT_RAM_LOCK) && defined(CONFIG_E500)
|
#if defined(CFG_INIT_RAM_LOCK) && (defined(CONFIG_E500) || defined(CONFIG_MPC86xx))
|
||||||
unlock_ram_in_cache(); /* it's time to unlock D-cache in e500 */
|
unlock_ram_in_cache(); /* it's time to unlock D-cache in e500 */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue