X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fprodrive%2Fp3mx%2Fp3mx.c;h=28c4ebad9771346cc55fb3e219262737352db87a;hb=3e780af127282e5e24fa737a5b56d7c4523a72c9;hp=0247bb80a40347b9e3c1f5281c1cd4ffbe6166de;hpb=cb5473205206c7f14cbb1e747f28ec75b48826e2;p=u-boot

diff --git a/board/prodrive/p3mx/p3mx.c b/board/prodrive/p3mx/p3mx.c
index 0247bb80a4..28c4ebad97 100644
--- a/board/prodrive/p3mx/p3mx.c
+++ b/board/prodrive/p3mx/p3mx.c
@@ -6,23 +6,7 @@
  *	Roel Loeffen, (C) Copyright 2006 Prodrive B.V.
  *	Josh Huber, (C) Copyright 2001 Mission Critical Linux, Inc.
  *
- * 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+
  *
  * modifications for the DB64360 eval board based by Ingo.Assmus@keymile.com
  * modifications for the cpci750 by reinhard.arlt@esd-electronics.com
@@ -316,16 +300,6 @@ int misc_init_r ()
 	return 0;
 }
 
-int board_early_init_r(void)
-{
-	/* now relocate the debug serial driver */
-	mpsc_putchar += gd->reloc_off;
-	mpsc_getchar += gd->reloc_off;
-	mpsc_test_char += gd->reloc_off;
-
-	return 0;
-}
-
 void after_reloc (ulong dest_addr, gd_t * gd)
 {
 	memoryMapDeviceSpace (BOOT_DEVICE, CONFIG_SYS_BOOT_SPACE, CONFIG_SYS_BOOT_SIZE);
@@ -345,13 +319,14 @@ void after_reloc (ulong dest_addr, gd_t * gd)
 
 int checkboard (void)
 {
-	char *s = getenv("serial#");
+	char buf[64];
+	int i = getenv_f("serial#", buf, sizeof(buf));
 
 	printf("Board: %s", CONFIG_SYS_BOARD_NAME);
 
-	if (s != NULL) {
+	if (i > 0) {
 		puts(", serial# ");
-		puts(s);
+		puts(buf);
 	}
 	putc('\n');
 
@@ -777,22 +752,18 @@ int mem_test_walk (void)
 /*********************************************************************/
 int testdram (void)
 {
-	char *s;
 	int rundata    = 0;
 	int runaddress = 0;
 	int runwalk    = 0;
 
 #ifdef CONFIG_SYS_DRAM_TEST_DATA
-	s = getenv ("testdramdata");
-	rundata = (s && (*s == 'y')) ? 1 : 0;
+	rundata = getenv_yesno("testdramdata") == 1;
 #endif
 #ifdef CONFIG_SYS_DRAM_TEST_ADDRESS
-	s = getenv ("testdramaddress");
-	runaddress = (s && (*s == 'y')) ? 1 : 0;
+	runaddress = getenv_yesno("testdramaddress") == 1;
 #endif
 #ifdef CONFIG_SYS_DRAM_TEST_WALK
-	s = getenv ("testdramwalk");
-	runwalk = (s && (*s == 'y')) ? 1 : 0;
+	runwalk = getenv_yesno("testdramwalk") == 1;
 #endif
 
 	if ((rundata == 1) || (runaddress == 1) || (runwalk == 1))
@@ -860,3 +831,8 @@ void my_remap_gt_regs_bootm (u32 cur_loc, u32 new_loc)
 	       != temp);
 
 }
+
+int board_eth_init(bd_t *bis)
+{
+	return mv6446x_eth_initialize(bis);
+}