Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'

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

diff --git a/board/mousse/mousse.c b/board/mousse/mousse.c
index f8f152976c2900011d2c20d3bdb41c3fdfe14720..e1724e657df52049da84238bb69f089286318887 100644 (file)
--- a/board/mousse/mousse.c
+++ b/board/mousse/mousse.c
@@ -7,28 +7,14 @@
  * (C) Copyright 2001
  * James Dougherty, jfd@cs.stanford.edu
  *
- * 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 <common.h>
 #include <mpc824x.h>
+#include <netdev.h>
 #include <asm/processor.h>
+#include <timestamp.h>
 
 #include "mousse.h"
 #include "m48t59y.h"
@@ -41,7 +27,7 @@ int checkboard (void)
        char buf[32];
 
        puts ("Board: MOUSSE MPC8240/KAHLUA - CHRP (MAP B)\n");
-       printf ("Built: %s at %s\n", __DATE__, __TIME__);
+       printf ("Built: %s at %s\n", U_BOOT_DATE, U_BOOT_TIME);
        printf ("MPLD:  Revision %d\n", SYS_REVID_GET ());
        printf ("Local Bus:  %s MHz\n", strmhz (buf, busfreq));
 
@@ -57,7 +43,7 @@ int checkflash (void)
 
 phys_size_t initdram (int board_type)
 {
-       return CFG_RAM_SIZE;
+       return CONFIG_SYS_RAM_SIZE;
 }
 
 
@@ -84,3 +70,8 @@ int misc_init_f (void)
        get_tod ();
        return 0;
 }
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}