Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/board/amcc/taishan/taishan.c b/board/amcc/taishan/taishan.c
index 279fae21c1cf45bfd42ccadc36b830e81198381e..fcaf7fde265bba7ee31d43aaba47333f1b302bb5 100644 (file)
--- a/board/amcc/taishan/taishan.c
+++ b/board/amcc/taishan/taishan.c
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <spd_sdram.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-emac.h>
 #include <netdev.h>
 
 #ifdef CONFIG_SYS_INIT_SHOW_RESET_REG
@@ -193,12 +193,13 @@ int misc_init_r(void)
 
 int checkboard (void)
 {
-       char *s = getenv ("serial#");
+       char buf[64];
+       int i = getenv_f("serial#", buf, sizeof(buf));
 
        printf ("Board: Taishan - AMCC PPC440GX Evaluation Board");
-       if (s != NULL) {
-               puts (", serial# ");
-               puts (s);
+       if (i > 0) {
+               puts(", serial# ");
+               puts(buf);
        }
        putc ('\n');
 
@@ -209,17 +210,6 @@ int checkboard (void)
        return (0);
 }
 
-#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 (ctrlc());
-}
-#endif
-
 int board_eth_init(bd_t *bis)
 {
        cpu_eth_init(bis);