X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fcogent%2Fmb.c;h=c0256433ce9040b641d4144fc8df0781ccba8df4;hb=7ae350a0305de592faa8903255c988d4e6afb194;hp=917132b3fbca8e900f57a1615677d91949101446;hpb=42dfe7a1844cbad7114038aaf03828acb7a84414;p=u-boot

diff --git a/board/cogent/mb.c b/board/cogent/mb.c
index 917132b3fb..c0256433ce 100644
--- a/board/cogent/mb.c
+++ b/board/cogent/mb.c
@@ -2,35 +2,19 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * 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 <board/cogent/dipsw.h>
-#include <board/cogent/lcd.h>
-#include <board/cogent/rtc.h>
-#include <board/cogent/par.h>
-#include <board/cogent/pci.h>
+#include "dipsw.h"
+#include "lcd.h"
+#include "rtc.h"
+#include "par.h"
+#include "pci.h"
 
 /* ------------------------------------------------------------------------- */
 
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
 
 #include <ioports.h>
 
@@ -202,7 +186,7 @@ const iop_conf_t iop_conf_tab[4][32] = {
 	 }
 };
 
-#endif /* CONFIG_8260 */
+#endif /* CONFIG_MPC8260 */
 
 /* ------------------------------------------------------------------------- */
 
@@ -233,7 +217,7 @@ int misc_init_f (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
 #ifdef CONFIG_CMA111
 	return (32L * 1024L * 1024L);