74xx_7xx: CPCI750: Minor coding style cleanup of cpci750.c

[u-boot] / board / esd / cpci750 / sdram_init.c

diff --git a/board/esd/cpci750/sdram_init.c b/board/esd/cpci750/sdram_init.c
index f43e83f4914dbd56a349911815bb36c15cee0fd0..4c03630fb574fd02eaefe9e56a811b69b863fa84 100644 (file)
--- a/board/esd/cpci750/sdram_init.c
+++ b/board/esd/cpci750/sdram_init.c
@@ -350,7 +350,7 @@ static int check_dimm (uchar slot, AUX_MEM_DIMM_INFO * dimmInfo)
        } else
                dimmInfo->slot = slot;  /* start to fill up dimminfo for this "slot" */
 
-#ifdef CFG_DISPLAY_DIMM_SPD_CONTENT
+#ifdef CONFIG_SYS_DISPLAY_DIMM_SPD_CONTENT
 
        for (i = 0; i <= 127; i++) {
                printf ("SPD-EEPROM Byte %3d = %3x (%3d)\n", i, data[i],
@@ -1570,8 +1570,8 @@ dram_size(long int *base, long int maxsize)
     for (cnt = STARTVAL/sizeof(long); cnt < maxsize/sizeof(long); cnt <<= 1) {
            addr = base + cnt;  /* pointer arith! */
 
-           save1=*addr;                /* save contents of addr */
-           save2=*b;           /* save contents of base */
+           save1 = *addr;              /* save contents of addr */
+           save2 = *b;         /* save contents of base */
 
            *addr=cnt;          /* write cnt to addr */
            *b=0;                       /* put null at base */
@@ -1602,7 +1602,7 @@ dram_size(long int *base, long int maxsize)
 
 /* ppcboot interface function to SDRAM init - this is where all the
  * controlling logic happens */
-long int
+phys_size_t
 initdram(int board_type)
 {
        int s0 = 0, s1 = 0;
@@ -1656,13 +1656,13 @@ initdram(int board_type)
        if (dimmInfo2.numOfModuleBanks > 2)
                printf("Error, SPD claims DIMM2 has >2 banks\n");
 
-       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;
 
-               if ((total + check) > CFG_GT_REGS)
-                       check = CFG_GT_REGS - total;
+               if ((total + check) > CONFIG_SYS_GT_REGS)
+                       check = CONFIG_SYS_GT_REGS - total;
 
                memory_map_bank(bank_no, total, check);
                realsize = dram_size((long int *)total, check);