* Patch by Michael Bendzick, 30 Aug 2004:

[karo-tx-uboot.git] / board / sbc8560 / sbc8560.c

diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c
index a784e3426a17400376374228f7aea1426a395b27..7f7272da1f7f25105d47909c9b5ea1a2b09a3255 100644 (file)
--- a/board/sbc8560/sbc8560.c
+++ b/board/sbc8560/sbc8560.c
@@ -235,7 +235,11 @@ int checkboard (void)
 
        get_sys_info (&sysinfo);
 
+#ifdef CONFIG_SBC8560
        printf ("Board: Wind River SBC8560 Board\n");
+#else
+       printf ("Board: Wind River SBC8540 Board\n");
+#endif
        printf ("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
        printf ("\tCCB: %lu MHz\n", sysinfo.freqSystemBus / 1000000);
        printf ("\tDDR: %lu MHz\n", sysinfo.freqSystemBus / 2000000);
@@ -256,11 +260,13 @@ long int initdram (int board_type)
        long dram_size = 0;
        extern long spd_sdram (void);
        volatile immap_t *immap = (immap_t *)CFG_IMMR;
+#if 0
 #if !defined(CONFIG_RAM_AS_FLASH)
        volatile ccsr_lbc_t *lbc= &immap->im_lbc;
        sys_info_t sysinfo;
        uint temp_lbcdll = 0;
 #endif
+#endif /* 0 */
 #if !defined(CONFIG_RAM_AS_FLASH) || defined(CONFIG_DDR_DLL)
        volatile ccsr_gur_t *gur= &immap->im_gur;
 #endif
@@ -279,7 +285,7 @@ long int initdram (int board_type)
        dram_size = fixed_sdram ();
 #endif
 
-#if XXX
+#if 0
 #if !defined(CONFIG_RAM_AS_FLASH) /* LocalBus SDRAM is not emulating flash */
        get_sys_info(&sysinfo);
        /* if localbus freq is less than 66Mhz,we use bypass mode,otherwise use DLL */