Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / utx8245 / utx8245.c

diff --git a/board/utx8245/utx8245.c b/board/utx8245/utx8245.c
index d870c9fcd84951315bedbbc90b665a9b9f1e8a7c..69d19e39e9f8d0dd05ba4f22db7833097aec4603 100644 (file)
--- a/board/utx8245/utx8245.c
+++ b/board/utx8245/utx8245.c
@@ -7,23 +7,7 @@
  * Matthew E. Karger, karger@arlut.utexas.edu
  * Applied Research Laboratories, The University of Texas at Austin
  *
- * 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>
@@ -32,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <pci.h>
+#include <netdev.h>
 
 #define        SAVE_SZ 32
 
@@ -46,7 +31,7 @@ int checkboard(void)
 }
 
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        long size;
        long new_bank0_end;
@@ -54,7 +39,7 @@ long int initdram(int board_type)
        long mear1;
        long emear1;
 
-       size = get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE);
+       size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
 
        new_bank0_end = size/2 - 1;
        new_bank1_end = size - 1;
@@ -67,7 +52,7 @@ long int initdram(int board_type)
        emear1 = (emear1 & 0xFFFF0000) |
                ((new_bank0_end & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT) |
                ((new_bank1_end & MICR_EADDR_MASK) >> MICR_EADDR_SHIFT << 8);
-               
+
        mpc824x_mpc107_setreg(MEAR1, mear1);
        mpc824x_mpc107_setreg(EMEAR1, emear1);
 
@@ -127,3 +112,8 @@ void pci_init_board (void)
 
        icache_enable();
 }
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}