Merge branch 'hs@denx.de' of git://git.denx.de/u-boot-staging

[u-boot] / board / evb64260 / sdram_init.c

diff --git a/board/evb64260/sdram_init.c b/board/evb64260/sdram_init.c
index 9ae446544171ed76ef845012950fc7fcf547b7b9..6f725f67f8141ed553524f8f8ee01c739f626b12 100644 (file)
--- a/board/evb64260/sdram_init.c
+++ b/board/evb64260/sdram_init.c
@@ -29,6 +29,7 @@
 #include <galileo/pci.h>
 #include <galileo/gt64260R.h>
 #include <net.h>
+#include <linux/compiler.h>
 
 #include "eth.h"
 #include "mpsc.h"
@@ -300,7 +301,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));
@@ -330,7 +331,8 @@ static int check_dimm (uchar slot, sdram_info_t * info)
 static int setup_sdram_common (sdram_info_t info[2])
 {
        ulong tmp;
-       int tpar = 2, tras_clocks = 5, registered = 1, ecc = 2;
+       int tpar = 2, tras_clocks = 5, registered = 1;
+       __maybe_unused int ecc = 2;
 
        if (!info[0].banks && !info[1].banks)
                return 0;
@@ -407,8 +409,9 @@ static int setup_sdram_common (sdram_info_t info[2])
 /* sets up the GT properly with information passed in */
 static int setup_sdram (sdram_info_t * info)
 {
-       ulong tmp, check;
+       ulong tmp;
        ulong *addr = 0;
+       __maybe_unused ulong check;
        int i;
 
        /* sanity checking */
@@ -598,7 +601,7 @@ phys_size_t 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 +620,7 @@ phys_size_t 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;