Merge branch 'u-boot/master' into u-boot-arm/master

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

diff --git a/board/linkstation/linkstation.c b/board/linkstation/linkstation.c
index afb96ae6ce6804c1c7cd887b2be853694790e3cb..75cda8681f6eff778fd1412d3181f061ff3ac76f 100644 (file)
--- a/board/linkstation/linkstation.c
+++ b/board/linkstation/linkstation.c
@@ -5,24 +5,11 @@
  *
  * Copyright (C) 2006 Mihai Georgian <u-boot@linuxnotincluded.org.uk>
  *
- * 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 <version.h>
 #include <common.h>
+#include <version.h>
 #include <mpc824x.h>
 #include <asm/io.h>
 #include <ns16550.h>
@@ -32,11 +19,12 @@
 #include <pci.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern void init_AVR_DUART(void);
 
 int checkboard (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        char *p;
        bd_t *bd = gd->bd;
 
@@ -53,7 +41,7 @@ int checkboard (void)
 
 phys_size_t initdram (int board_type)
 {
-       return (get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE));
+       return (get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE));
 }
 
 /*