ARM: zynq: Remove spl.h

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

diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c
index 008f765af89aa89466aa10f6f52835c462587cf9..fe139f4920d196d543d4aa5a2885230880cf8b5c 100644 (file)
--- a/board/gen860t/gen860t.c
+++ b/board/gen860t/gen860t.c
@@ -3,23 +3,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * Keith Outwater, keith_outwater@mvis.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <virtex2.h>
@@ -132,7 +116,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 +125,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) {
@@ -276,7 +260,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);
        }
@@ -292,14 +276,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