Merge branch 'master' of /home/wd/git/u-boot/master

[karo-tx-uboot.git] / board / snmc / qs850 / qs850.c

diff --git a/board/snmc/qs850/qs850.c b/board/snmc/qs850/qs850.c
index ba5a8fb0a1f6a89a01f25975ca3ef5278dfbd2f8..43f7495e46f570c6f7ad1af1caa36f17609e41a6 100644 (file)
--- a/board/snmc/qs850/qs850.c
+++ b/board/snmc/qs850/qs850.c
@@ -86,6 +86,13 @@ const uint sdram_table[] =
  *
  * Always return 1
  */
+#if defined(CONFIG_QS850)
+#define BOARD_IDENTITY "QS850"
+#elif defined(CONFIG_QS823)
+#define BOARD_IDENTITY "QS823"
+#else
+#define        BOARD_IDENTITY  "QS???"
+#endif
 
 int checkboard (void)
 {
@@ -93,17 +100,11 @@ int checkboard (void)
        char buf[64];
        int i;
 
-       i = getenv_r("serial#", buf, sizeof(buf));
+       i = getenv_f("serial#", buf, sizeof(buf));
        s = (i>0) ? buf : NULL;
 
-#ifdef CONFIG_QS850
-       if (!s || strncmp(s, "QS850", 5)) {
-               puts ("### No HW ID - assuming QS850");
-#endif
-#ifdef CONFIG_QS823
-       if (!s || strncmp(s, "QS823", 5)) {
-               puts ("### No HW ID - assuming QS823");
-#endif
+       if (!s || strncmp(s, BOARD_IDENTITY, 5)) {
+               puts ("### No HW ID - assuming " BOARD_IDENTITY);
        } else {
                for (e=s; *e; ++e) {
                if (*e == ' ')
@@ -145,7 +146,7 @@ int checkboard (void)
 
 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;
 
@@ -154,17 +155,17 @@ phys_size_t initdram (int board_type)
        /*
        * Prescaler for refresh
        */
-       memctl->memc_mptpr = CFG_MPTPR;
+       memctl->memc_mptpr = CONFIG_SYS_MPTPR;
 
        /*
        * Map controller bank 1 to the SDRAM address
        */
-       memctl->memc_or1 = CFG_OR1;
-       memctl->memc_br1 = CFG_BR1;
+       memctl->memc_or1 = CONFIG_SYS_OR1;
+       memctl->memc_br1 = CONFIG_SYS_BR1;
        udelay(1000);
 
        /* perform SDRAM initialization sequence */
-       memctl->memc_mamr = CFG_16M_MAMR;
+       memctl->memc_mamr = CONFIG_SYS_16M_MAMR;
        udelay(100);
 
        /* Program the SDRAM's Mode Register */
@@ -191,7 +192,7 @@ phys_size_t initdram (int board_type)
        /*
        * Check for 32M SDRAM Memory Size
        */
-       size = dram_size(CFG_32M_MAMR|MAMR_PTAE,
+       size = dram_size(CONFIG_SYS_32M_MAMR|MAMR_PTAE,
        (long *)SDRAM_BASE, SDRAM_32M_MAX_SIZE);
        udelay (1000);
 
@@ -199,7 +200,7 @@ phys_size_t initdram (int board_type)
        * Check for 16M SDRAM Memory Size
        */
        if (size != SDRAM_32M_MAX_SIZE) {
-       size = dram_size(CFG_16M_MAMR|MAMR_PTAE,
+       size = dram_size(CONFIG_SYS_16M_MAMR|MAMR_PTAE,
        (long *)SDRAM_BASE, SDRAM_16M_MAX_SIZE);
        udelay (1000);
        }
@@ -220,7 +221,7 @@ phys_size_t initdram (int board_type)
 
 static long int dram_size (long int mamr_value, long int *base, long int maxsize)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
 
        memctl->memc_mamr = mamr_value;