Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[oweals/u-boot.git] / board / g2000 / g2000.c

diff --git a/board/g2000/g2000.c b/board/g2000/g2000.c
index 9fcab74849834b91790b13a533b205ad3b611d9e..b35038dc4372fba6311b391ce77c13805b3bcb2a 100644 (file)
--- a/board/g2000/g2000.c
+++ b/board/g2000/g2000.c
@@ -33,7 +33,7 @@
 #define MEM_SDTR1_INIT_VAL      0x00854005
 #define SDRAM0_CFG_ENABLE       0x80000000
 
-#define CFG_SDRAM_SIZE          0x04000000      /* 64 MB */
+#define CONFIG_SYS_SDRAM_SIZE          0x04000000      /* 64 MB */
 
 int board_early_init_f (void)
 {
@@ -77,8 +77,8 @@ int misc_init_r (void)
        /*
         * Set NAND-FLASH GPIO signals to default
         */
-       out32(GPIO0_OR, in32(GPIO0_OR) & ~(CFG_NAND_CLE | CFG_NAND_ALE));
-       out32(GPIO0_OR, in32(GPIO0_OR) | CFG_NAND_CE);
+       out32(GPIO0_OR, in32(GPIO0_OR) & ~(CONFIG_SYS_NAND_CLE | CONFIG_SYS_NAND_ALE));
+       out32(GPIO0_OR, in32(GPIO0_OR) | CONFIG_SYS_NAND_CE);
 #endif
 
        return (0);
@@ -127,11 +127,11 @@ long int init_sdram_static_settings(void)
        udelay(500);
        mtsdram0( mem_mcopt1, MEM_MCOPT1_INIT_VAL|SDRAM0_CFG_ENABLE );
 
-       return (CFG_SDRAM_SIZE); /* CFG_SDRAM_SIZE is in G2000.h */
+       return (CONFIG_SYS_SDRAM_SIZE); /* CONFIG_SYS_SDRAM_SIZE is in G2000.h */
  }
 
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        long int ret;
 
@@ -151,11 +151,11 @@ long int initdram (int board_type)
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/nand_legacy.h>
-extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
+extern struct nand_chip nand_dev_desc[CONFIG_SYS_MAX_NAND_DEVICE];
 
 void nand_init(void)
 {
-       nand_probe(CFG_NAND_BASE);
+       nand_probe(CONFIG_SYS_NAND_BASE);
        if (nand_dev_desc[0].ChipID != NAND_ChipID_UNKNOWN) {
                print_size(nand_dev_desc[0].totlen, "\n");
        }
@@ -185,7 +185,7 @@ int do_dumpebc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        dumpebc,        1,      1,      do_dumpebc,
-       "dumpebc - Dump all EBC registers\n",
+       "Dump all EBC registers",
        NULL
 );
 
@@ -207,7 +207,7 @@ int do_dumpdcr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        dumpdcr,        1,      1,      do_dumpdcr,
-       "dumpdcr - Dump all DCR registers\n",
+       "Dump all DCR registers",
        NULL
 );
 
@@ -271,7 +271,7 @@ int do_dumpspr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        dumpspr,        1,      1,      do_dumpspr,
-       "dumpspr - Dump all SPR registers\n",
+       "Dump all SPR registers",
        NULL
 );
 #endif