Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 15977e4..adc1f19 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -227,13 +227,6 @@ static int initr_post_backlog(void)
 }
 #endif
 
-#ifdef CONFIG_SYS_DELAYED_ICACHE
-static int initr_icache_enable(void)
-{
-       return 0;
-}
-#endif
-
 #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
 static int initr_unlock_ram_in_cache(void)
 {
@@ -639,11 +632,7 @@ static int initr_pcmcia(void)
 #if defined(CONFIG_IDE)
 static int initr_ide(void)
 {
-#ifdef CONFIG_IDE_8xx_PCCARD
-       puts("PCMCIA:");
-#else
        puts("IDE:   ");
-#endif
 #if defined(CONFIG_START_IDE)
        if (board_start_ide())
                ide_init();
@@ -786,9 +775,6 @@ static init_fnc_t init_sequence_r[] = {
        initr_post_backlog,
 #endif
        INIT_FUNC_WATCHDOG_RESET
-#ifdef CONFIG_SYS_DELAYED_ICACHE
-       initr_icache_enable,
-#endif
 #if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT)
        /*
         * Do early PCI configuration _before_ the flash gets initialised,