rename CFG_ENV macros to CONFIG_ENV

[kernel/u-boot.git] / board / gen860t / gen860t.c

diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c
index d448f9f..5c497b6 100644 (file)
--- a/board/gen860t/gen860t.c
+++ b/board/gen860t/gen860t.c
@@ -158,7 +158,7 @@ int checkboard (void)
 /*
  * Initialize SDRAM
  */
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        volatile immap_t *immr = (immap_t *) CFG_IMMR;
        volatile memctl8xx_t *memctl = &immr->im_memctl;
@@ -223,8 +223,6 @@ long int initdram (int board_type)
  * The DOC lives in the CS2* space
  */
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
-
 void doc_init (void)
 {
        printf ("Probing at 0x%.8x: ", DOC_BASE);
@@ -254,7 +252,7 @@ int misc_init_r (void)
        mii_init ();
 #endif
 
-#if (CONFIG_FPGA)
+#if defined(CONFIG_FPGA)
        gen860t_init_fpga ();
 #endif
        return 0;