arm:at91-boards: remove console_init_f where unnecessary

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

diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c
index d448f9fa33dc92540a04fb47d6b20eed2fc3f4d0..d175858d42f2a5204fea07d4118202126288229a 100644 (file)
--- a/board/gen860t/gen860t.c
+++ b/board/gen860t/gen860t.c
@@ -132,7 +132,7 @@ int checkboard (void)
        char buf[64];
        int i;
 
-       i = getenv_r ("board_id", buf, sizeof (buf));
+       i = getenv_f("board_id", buf, sizeof (buf));
        s = (i > 0) ? buf : NULL;
 
        if (s) {
@@ -141,7 +141,7 @@ int checkboard (void)
                printf ("<unknown> ");
        }
 
-       i = getenv_r ("serial#", buf, sizeof (buf));
+       i = getenv_f("serial#", buf, sizeof (buf));
        s = (i > 0) ? buf : NULL;
 
        if (s) {
@@ -158,9 +158,9 @@ 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 immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immr->im_memctl;
 
        upmconfig (UPMA,
@@ -171,14 +171,14 @@ long int initdram (int board_type)
        /*
         * Setup MAMR register
         */
-       memctl->memc_mptpr = CFG_MPTPR_1BK_8K;
-       memctl->memc_mamr = CFG_MAMR_8COL & (~(MAMR_PTAE));     /* no refresh yet */
+       memctl->memc_mptpr = CONFIG_SYS_MPTPR_1BK_8K;
+       memctl->memc_mamr = CONFIG_SYS_MAMR_8COL & (~(MAMR_PTAE));      /* no refresh yet */
 
        /*
         * Map CS1* to SDRAM bank
         */
-       memctl->memc_or1 = CFG_OR1;
-       memctl->memc_br1 = CFG_BR1;
+       memctl->memc_or1 = CONFIG_SYS_OR1;
+       memctl->memc_br1 = CONFIG_SYS_BR1;
 
        /*
         * Perform SDRAM initialization sequence:
@@ -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);
@@ -237,7 +235,7 @@ void doc_init (void)
  */
 int misc_init_r (void)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immr->im_memctl;
 
        /*
@@ -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;
@@ -278,7 +276,7 @@ int last_stage_init (void)
        /*
         * Read the environment to see what to do with the beeper
         */
-       i = getenv_r ("beeper", buf, sizeof (buf));
+       i = getenv_f("beeper", buf, sizeof (buf));
        if (i > 0) {
                do_beeper (buf);
        }
@@ -294,14 +292,3 @@ void board_poweroff (void)
        puts ("### Please power off the board ###\n");
        while (1);
 }
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed (void)
-{
-       return 0;               /* No hotkeys supported */
-}
-#endif