X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fgdsys%2Fintip%2Fintip.c;h=0132b2595d583bcb8b0cdd406690b07d4d2467a6;hb=e69e482bbf16795539af112d6a21d4ddaee35105;hp=23a10c41f9f415c0c082d8fda0686edc23684163;hpb=bb3bcfa2426cc6a0aecec7270e3ee67ca843a125;p=u-boot

diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c
index 23a10c41f9..0132b2595d 100644
--- a/board/gdsys/intip/intip.c
+++ b/board/gdsys/intip/intip.c
@@ -23,7 +23,7 @@
  */
 
 #include <common.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <i2c.h>
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/4xx_pcie.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 
 extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
@@ -124,7 +124,8 @@ int get_cpu_num(void)
 
 int checkboard(void)
 {
-	char *s = getenv("serial#");
+	char buf[64];
+	int i = getenv_f("serial#", buf, sizeof(buf));
 
 #ifdef CONFIG_DEVCONCENTER
 	printf("Board: DevCon-Center");
@@ -132,9 +133,9 @@ int checkboard(void)
 	printf("Board: Intip");
 #endif
 
-	if (s != NULL) {
+	if (i > 0) {
 		puts(", serial# ");
-		puts(s);
+		puts(buf);
 	}
 	putc('\n');