LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ppc: Unlock cache-as-ram in a consistent manner" 

This reverts commit 982adfc610.

This patch causes problems on MPC83xx boards - flash recognition stops
working.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2009-07-26 23:28:02 +02:00
parent 8bf7437c01
commit 9c67352f72
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib_ppc/board.c
View File

@ -68,7 +68,7 @@
#if defined(CONFIG_LOGBUFFER) #if defined(CONFIG_LOGBUFFER)
#include <logbuff.h> #include <logbuff.h>
#endif #endif
#if defined(CONFIG_SYS_INIT_RAM_LOCK) #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
#include <asm/cache.h> #include <asm/cache.h>
#endif #endif
#ifdef CONFIG_PS2KBD #ifdef CONFIG_PS2KBD
@ -754,8 +754,8 @@ 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(CONFIG_SYS_INIT_RAM_LOCK) #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
unlock_ram_in_cache(); /* it's time to unlock D-cache */ unlock_ram_in_cache(); /* it's time to unlock D-cache in e500 */
#endif #endif
#if defined(CONFIG_BAB7xx) || defined(CONFIG_CPC45) #if defined(CONFIG_BAB7xx) || defined(CONFIG_CPC45)

9
lib_ppc/bootm.c
View File

@ -38,6 +38,11 @@
#include <fdt.h> #include <fdt.h>
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
#endif
#ifdef CONFIG_SYS_INIT_RAM_LOCK
#include <asm/cache.h>
#endif #endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -66,6 +71,10 @@ static void boot_jump_linux(bootm_headers_t *images)
show_boot_progress (15); show_boot_progress (15);
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && !defined(CONFIG_E500)
unlock_ram_in_cache();
#endif
#if defined(CONFIG_OF_LIBFDT) #if defined(CONFIG_OF_LIBFDT)
if (of_flat_tree) { /* device tree; boot new style */ if (of_flat_tree) { /* device tree; boot new style */
/* /*