Fix e-mail address of Gary Jennejohn.

[u-boot] / board / esd / common / auto_update.c

diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c
index 7e6eea0f1c877c706566917c67812acb52d73996..8593125ef1dd2a281795e20b266b5f6fc2364d32 100644 (file)
--- a/board/esd/common/auto_update.c
+++ b/board/esd/common/auto_update.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2003-2004
- * Gary Jennejohn, DENX Software Engineering, gj@denx.de.
+ * Gary Jennejohn, DENX Software Engineering, garyj@denx.de.
  * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
  *
  * See file CREDITS for list of people who contributed to this
@@ -27,7 +27,7 @@
 #include <command.h>
 #include <image.h>
 #include <asm/byteorder.h>
-#if defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_NAND_LEGACY)
 #include <linux/mtd/nand_legacy.h>
 #endif
 #include <fat.h>
@@ -58,7 +58,7 @@ extern int flash_sect_erase(ulong, ulong);
 extern int flash_sect_protect (int, ulong, ulong);
 extern int flash_write (char *, ulong, ulong);
 
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
 /* references to names in cmd_nand.c */
 #define NANDRW_READ    0x01
 #define NANDRW_WRITE   0x00
@@ -72,7 +72,7 @@ extern int nand_legacy_erase(struct nand_chip* nand, size_t ofs,
                             size_t len, int clean);
 #endif
 
-extern block_dev_desc_t ide_dev_desc[CFG_IDE_MAXDEVICE];
+extern block_dev_desc_t ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
 
 int au_check_cksum_valid(int i, long nbytes)
 {
@@ -158,7 +158,7 @@ int au_do_update(int i, long sz)
        int off, rc;
        uint nbytes;
        int k;
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
        int total;
 #endif
 
@@ -241,7 +241,7 @@ int au_do_update(int i, long sz)
                        debug ("flash_sect_erase(%lx, %lx);\n", start, end);
                        flash_sect_erase (start, end);
                } else {
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
                        printf ("Updating NAND FLASH with image %s\n",
                                au_image[i].name);
                        debug ("nand_legacy_erase(%lx, %lx);\n", start, end);
@@ -273,7 +273,7 @@ int au_do_update(int i, long sz)
                        rc = flash_write ((char *)addr, start,
                                          (nbytes + 1) & ~1);
                } else {
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
                        debug ("nand_legacy_rw(%p, %lx, %x)\n",
                               addr, start, nbytes);
                        rc = nand_legacy_rw (nand_dev_desc,
@@ -298,7 +298,7 @@ int au_do_update(int i, long sz)
                        rc = crc32 (0, (uchar *)(start + off),
                                    image_get_data_size (hdr));
                } else {
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_LEGACY)
                        rc = nand_legacy_rw (nand_dev_desc,
                                             NANDRW_READ | NANDRW_JFFS2 |
                                             NANDRW_JFFS2_SKIP,
@@ -335,7 +335,7 @@ static void process_macros (const char *input, char *output)
        char c, prev;
        const char *varname_start = NULL;
        int inputcnt  = strlen (input);
-       int outputcnt = CFG_CBSIZE;
+       int outputcnt = CONFIG_SYS_CBSIZE;
        int state = 0;  /* 0 = waiting for '$'  */
                        /* 1 = waiting for '(' or '{' */
                        /* 2 = waiting for ')' or '}' */
@@ -394,7 +394,7 @@ static void process_macros (const char *input, char *output)
            case 2:                     /* Waiting for )        */
                if (c == ')' || c == '}') {
                        int i;
-                       char envname[CFG_CBSIZE], *envval;
+                       char envname[CONFIG_SYS_CBSIZE], *envval;
                        /* Varname # of chars */
                        int envcnt = input - varname_start - 1;
 
@@ -550,7 +550,7 @@ int auto_update(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        autoupd,        1,      1,      auto_update,
-       "autoupd - Automatically update images\n",
+       "Automatically update images",
        NULL
 );
 #endif /* CONFIG_AUTO_UPDATE */