karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / arch / arm / cpu / arm926ejs / cpu.c

diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c
index 174c8d36b21134f1688ad4efdadad4de910a512b..a90ce3047bd27f2f100512ce6239073ac6c92fa9 100644 (file)
--- a/arch/arm/cpu/arm926ejs/cpu.c
+++ b/arch/arm/cpu/arm926ejs/cpu.c
@@ -15,7 +15,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <lcd.h>
 #include <asm/system.h>
 
 static void cache_flush(void);
@@ -31,14 +30,6 @@ int cleanup_before_linux (void)
 
        disable_interrupts ();
 
-#ifdef CONFIG_LCD
-       {
-               /* switch off LCD panel */
-               lcd_panel_disable();
-               /* disable LCD controller */
-               lcd_disable();
-       }
-#endif
 
        /* turn off I/D-cache */
        icache_disable();
@@ -54,7 +45,9 @@ int cleanup_before_linux (void)
 /* flush I/D-cache */
 static void cache_flush (void)
 {
+#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
        unsigned long i = 0;
 
        asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i));
+#endif
 }