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

[karo-tx-uboot.git] / board / evb64260 / sdram_init.c

diff --git a/board/evb64260/sdram_init.c b/board/evb64260/sdram_init.c
index fae6d1090dfdc7bb295deffb355f408cb657132f..e2f07699c3df1ccea1042d38193918de03757056 100755 (executable)
--- a/board/evb64260/sdram_init.c
+++ b/board/evb64260/sdram_init.c
@@ -300,7 +300,7 @@ static int check_dimm (uchar slot, sdram_info_t * info)
 
        DP (printf ("tpar set to: %d\n", info->tpar));
 
-#ifdef CFG_BROKEN_CL2
+#ifdef CONFIG_SYS_BROKEN_CL2
        if (info->tpar == 2) {
                info->tpar = 3;
                DP (printf ("tpar fixed-up to: %d\n", info->tpar));
@@ -524,7 +524,7 @@ static long int dram_size (long int *base, long int maxsize)
 
 /* U-Boot interface function to SDRAM init - this is where all the
  * controlling logic happens */
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        ulong checkbank[4] = {[0 ... 3] = 0 };
        int bank_no;
@@ -598,7 +598,7 @@ long int initdram (int board_type)
         *         limitation: we only support 256M per bank due to
         *         us only having 1 BAT for all DRAM
         */
-       for (bank_no = 0; bank_no < CFG_DRAM_BANKS; bank_no++) {
+       for (bank_no = 0; bank_no < CONFIG_SYS_DRAM_BANKS; bank_no++) {
                /* skip over banks that are not populated */
                if (!checkbank[bank_no])
                        continue;
@@ -617,7 +617,7 @@ long int initdram (int board_type)
         *         space.
         */
        dimm_info[0].banks = dimm_info[1].banks = 0;
-       for (bank_no = 0; bank_no < CFG_DRAM_BANKS; bank_no++) {
+       for (bank_no = 0; bank_no < CONFIG_SYS_DRAM_BANKS; bank_no++) {
                if (!checkbank[bank_no])
                        continue;