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

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

diff --git a/board/svm_sc8xx/svm_sc8xx.c b/board/svm_sc8xx/svm_sc8xx.c
index 9bb9fd019f76f3b9c84a1c211426894979effd99..4390e49dd1c38b5c828d78c360deac8e4c5e7124 100755 (executable)
--- a/board/svm_sc8xx/svm_sc8xx.c
+++ b/board/svm_sc8xx/svm_sc8xx.c
@@ -100,17 +100,17 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
-       volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
+       volatile immap_t     *immap  = (immap_t *)CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
        long int size_b0 = 0;
 
        upmconfig(UPMA, (uint *)sdram_table, sizeof(sdram_table)/sizeof(uint));
 
-       memctl->memc_mptpr = CFG_MPTPR;
+       memctl->memc_mptpr = CONFIG_SYS_MPTPR;
 #if defined (CONFIG_SDRAM_16M)
-       memctl->memc_mamr = 0x00802114 | CFG_MxMR_PTx;
+       memctl->memc_mamr = 0x00802114 | CONFIG_SYS_MxMR_PTx;
        memctl->memc_mcr  = 0x80002105;     /* SDRAM bank 0 */
        udelay(1);
        memctl->memc_mcr  = 0x80002830;
@@ -122,7 +122,7 @@ long int initdram (int board_type)
        memctl->memc_or1 =  0xff000a00;
        size_b0 = 0x01000000;
 #elif defined (CONFIG_SDRAM_32M)
-       memctl->memc_mamr = 0x00904114 | CFG_MxMR_PTx;
+       memctl->memc_mamr = 0x00904114 | CONFIG_SYS_MxMR_PTx;
        memctl->memc_mcr  = 0x80002105;     /* SDRAM bank 0 */
        udelay(1);
        memctl->memc_mcr  = 0x80002830;
@@ -134,7 +134,7 @@ long int initdram (int board_type)
        memctl->memc_or1 =  0xfe000a00;
        size_b0 = 0x02000000;
 #elif defined (CONFIG_SDRAM_64M)
-       memctl->memc_mamr = 0x00a04114 | CFG_MxMR_PTx;
+       memctl->memc_mamr = 0x00a04114 | CONFIG_SYS_MxMR_PTx;
        memctl->memc_mcr  = 0x80002105;     /* SDRAM bank 0 */
        udelay(1);
        memctl->memc_mcr  = 0x80002830;
@@ -153,10 +153,9 @@ long int initdram (int board_type)
        return (size_b0 );
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
-extern void doc_probe (ulong physadr);
+#if defined(CONFIG_CMD_DOC)
 void doc_init (void)
 {
-               doc_probe (CFG_DOC_BASE);
+               doc_probe (CONFIG_SYS_DOC_BASE);
 }
 #endif