Merge branch 'at91' of git://git.denx.de/u-boot-atmel

[karo-tx-uboot.git] / board / mpr2 / mpr2.c

diff --git a/board/mpr2/mpr2.c b/board/mpr2/mpr2.c
index 2ddb0c10c190484fda1145347e3491f75d640a2a..0ec0c198b9ddc3635166009235dec4b6ada8c988 100644 (file)
--- a/board/mpr2/mpr2.c
+++ b/board/mpr2/mpr2.c
@@ -67,7 +67,7 @@ int board_init(void)
 
        /* set Pin Select Register D: Reserved, SIOF1_TxD, Reserved, SIOF1_MCLK, Reserved, SIOF1_SYNC, Reserved, SCIF1_SCK, Reserved */
        __raw_writew(0x0000, PSELD);  /*     0         00        00          00        00          00        00         00         0 */
-       
+
        /* OTH:  (00) Other fuction
         * GPO:  (01) General Purpose Output
         * GPI:  (11) General Purpose Input
@@ -154,9 +154,8 @@ int dram_init(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
 
-       gd->bd->bi_memstart = CFG_SDRAM_BASE;
-       gd->bd->bi_memsize = CFG_SDRAM_SIZE;
-       printf("SDRAM: %dMB\n", CFG_SDRAM_SIZE / (1024 * 1024));
+       gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
+       printf("SDRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
        return 0;
 }
-