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

[oweals/u-boot.git] / include / configs / TQM85xx.h

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 26b12f9acff22bfce2e9b2d4bad3749ecd923032..1fbf4bf49244b3e2591af55836b36d86feba3b22 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -351,8 +351,6 @@
 /* NAND FLASH */
 #ifdef CONFIG_NAND
 
-#undef CONFIG_NAND_LEGACY
-
 #define CONFIG_NAND_FSL_UPM    1
 
 #define        CONFIG_MTD_NAND_ECC_JFFS2       1       /* use JFFS2 ECC        */
@@ -374,6 +372,8 @@
 
 #define NAND_BIG_DELAY_US              25      /* max tR for Samsung devices   */
 
+#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
+
 #endif /* CONFIG_NAND */
 
 /*
@@ -567,6 +567,8 @@
 #define        CONFIG_JFFS2_NAND       1
 
 #ifdef CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
 #define MTDIDS_DEFAULT         "nand0=TQM85xx-nand"
 #define MTDPARTS_DEFAULT       "mtdparts=TQM85xx-nand:-"
 #else
@@ -667,7 +669,7 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        CONFIG_ENV_BOOTFILE                                             \
        CONFIG_ENV_FDT_FILE                                             \
-       CONFIG_ENV_CONSDEV                                                      \
+       CONFIG_ENV_CONSDEV                                              \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=$serverip:$rootpath\0"                         \
@@ -691,12 +693,11 @@
        "fdt_addr=ffec0000\0"                                           \
        "kernel_addr=ffd00000\0"                                        \
        "ramdisk_addr=ff800000\0"                                       \
-       CONFIG_ENV_UBOOT                                                        \
+       CONFIG_ENV_UBOOT                                                \
        "load=tftp 100000 $uboot\0"                                     \
        "update=protect off $uboot_addr +$filesize;"                    \
                "erase $uboot_addr +$filesize;"                         \
-               "cp.b 100000 $uboot_addr $filesize;"                    \
-               "setenv filesize;saveenv\0"                             \
+               "cp.b 100000 $uboot_addr $filesize"                     \
        "upd=run load update\0"                                         \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"