rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / board / bf561-ezkit / bf561-ezkit.c

diff --git a/board/bf561-ezkit/bf561-ezkit.c b/board/bf561-ezkit/bf561-ezkit.c
index 989b0194c1eab4c64e86e7ff97d1baa58430677a..a74ff0db6ead89e65ad5deece9b58d78ee958c0e 100644 (file)
--- a/board/bf561-ezkit/bf561-ezkit.c
+++ b/board/bf561-ezkit/bf561-ezkit.c
@@ -29,6 +29,8 @@
 #include <common.h>
 #include <asm/io.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int checkboard(void)
 {
        printf("CPU:   ADSP BF561\n");
@@ -37,9 +39,8 @@ int checkboard(void)
        return 0;
 }
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
-       DECLARE_GLOBAL_DATA_PTR;
 #ifdef DEBUG
        int brate;
        char *tmp = getenv("baudrate");
@@ -49,12 +50,12 @@ long int initdram(int board_type)
        printf("tRCD %d SCLK Cycles,tRP %d SCLK Cycles,tRAS %d SCLK Cycles"
               "tWR %d SCLK Cycles,CAS Latency %d SCLK cycles \n",
               3, 3, 6, 2, 3);
-       printf("SDRAM Begin: 0x%x\n", CFG_SDRAM_BASE);
-       printf("Bank size = %d MB\n", CFG_MAX_RAM_SIZE >> 20);
+       printf("SDRAM Begin: 0x%x\n", CONFIG_SYS_SDRAM_BASE);
+       printf("Bank size = %d MB\n", CONFIG_SYS_MAX_RAM_SIZE >> 20);
 #endif
-       gd->bd->bi_memstart = CFG_SDRAM_BASE;
-       gd->bd->bi_memsize = CFG_MAX_RAM_SIZE;
-       return CFG_MAX_RAM_SIZE;
+       gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
+       return CONFIG_SYS_MAX_RAM_SIZE;
 }
 
 #if defined(CONFIG_MISC_INIT_R)
@@ -64,9 +65,9 @@ int misc_init_r(void)
        /* Keep PF12 low to be able to drive the USB-LAN Extender */
        *pFIO0_DIR = 0x0000;
        *pFIO0_FLAG_C = 0x1000; /* Clear PF12 */
-       sync();
+       SSYNC();
        *pFIO0_POLAR = 0x0000;
-       sync();
+       SSYNC();
 
        return 0;
 }