Skip to content
Snippets Groups Projects
Commit 9c67352f authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

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


This reverts commit 982adfc6.

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

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 8bf7437c
No related branches found
No related tags found
No related merge requests found
......@@ -68,7 +68,7 @@
#if defined(CONFIG_LOGBUFFER)
#include <logbuff.h>
#endif
#if defined(CONFIG_SYS_INIT_RAM_LOCK)
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
#include <asm/cache.h>
#endif
#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 */
#endif
#if defined(CONFIG_SYS_INIT_RAM_LOCK)
unlock_ram_in_cache(); /* it's time to unlock D-cache */
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
unlock_ram_in_cache(); /* it's time to unlock D-cache in e500 */
#endif
#if defined(CONFIG_BAB7xx) || defined(CONFIG_CPC45)
......
......@@ -38,6 +38,11 @@
#include <fdt.h>
#include <libfdt.h>
#include <fdt_support.h>
#endif
#ifdef CONFIG_SYS_INIT_RAM_LOCK
#include <asm/cache.h>
#endif
DECLARE_GLOBAL_DATA_PTR;
......@@ -66,6 +71,10 @@ static void boot_jump_linux(bootm_headers_t *images)
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 (of_flat_tree) { /* device tree; boot new style */
/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment