Merge git://www.denx.de/git/u-boot

[u-boot] / board / amcc / ebony / ebony.c

diff --git a/board/amcc/ebony/ebony.c b/board/amcc/ebony/ebony.c
index 9191f0f60f2e7c2f98a22d1db7133fa2645730d6..dcafac950d67bcf96ca35828f8c0e2e11131f883 100644 (file)
--- a/board/amcc/ebony/ebony.c
+++ b/board/amcc/ebony/ebony.c
@@ -28,6 +28,8 @@
 #define FLASH_ONBD_N           2       /* 00000010 */
 #define FLASH_SRAM_SEL         1       /* 00000001 */
 
+DECLARE_GLOBAL_DATA_PTR;
+
 long int fixed_sdram(void);
 
 int board_early_init_f(void)
@@ -90,11 +92,8 @@ int board_early_init_f(void)
 
 int checkboard(void)
 {
-       sys_info_t sysinfo;
        char *s = getenv("serial#");
 
-       get_sys_info(&sysinfo);
-
        printf("Board: Ebony - AMCC PPC440GP Evaluation Board");
        if (s != NULL) {
                puts(", serial# ");
@@ -102,11 +101,6 @@ int checkboard(void)
        }
        putc('\n');
 
-       printf("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz / 1000000);
-       printf("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
-       printf("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000);
-       printf("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000);
-       printf("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000);
        return (0);
 }
 
@@ -115,7 +109,7 @@ long int initdram(int board_type)
        long dram_size = 0;
 
 #if defined(CONFIG_SPD_EEPROM)
-       dram_size = spd_sdram(0);
+       dram_size = spd_sdram();
 #else
        dram_size = fixed_sdram();
 #endif
@@ -243,8 +237,6 @@ int pci_pre_init(struct pci_controller *hose)
 #if defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT)
 void pci_target_init(struct pci_controller *hose)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /*--------------------------------------------------------------------------+
         * Disable everything
         *--------------------------------------------------------------------------*/