imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / xilinx / ml300 / ml300.c

diff --git a/board/xilinx/ml300/ml300.c b/board/xilinx/ml300/ml300.c
index dad562f1c7761d0d2d47fb867e18bea8838444ca..e64beccc1c703682d0f7b35329cd6f8eba52f140 100755 (executable)
--- a/board/xilinx/ml300/ml300.c
+++ b/board/xilinx/ml300/ml300.c
@@ -38,11 +38,11 @@
  *
  */
 
+#include <config.h>
 #include <common.h>
 #include <asm/processor.h>
-#include "xparameters.h"
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 extern void convert_env(void);
 #endif
 
@@ -79,7 +79,7 @@ checkboard(void)
        return (0);
 }
 
-long int
+phys_size_t
 initdram(int board_type)
 {
        return 128 * 1024 * 1024;
@@ -108,7 +108,7 @@ ulong
 get_PCI_freq(void)
 {
        ulong val;
-       PPC405_SYS_INFO sys_info;
+       PPC4xx_SYS_INFO sys_info;
 
        get_sys_info(&sys_info);
        val = sys_info.freqPCI;