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

[u-boot] / include / configs / m28evk.h

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c26b720b9b8532b497fda7343815a402d579f896..1b51fe2dc51cf9b3d1d23612b35315dd470cb365 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -135,7 +135,7 @@
  */
 #ifdef CONFIG_CMD_MMC
 #define        CONFIG_MMC
-#define        CONFIG_MMC_BOUNCE_BUFFER
+#define        CONFIG_BOUNCE_BUFFER
 #define        CONFIG_GENERIC_MMC
 #define        CONFIG_MXS_MMC
 #endif
@@ -171,13 +171,15 @@
 #define        CONFIG_LZO
 #define        CONFIG_MTD_DEVICE
 #define        CONFIG_MTD_PARTITIONS
-#define        MTDIDS_DEFAULT                  "nand0=gpmi-nand.0"
+#define        MTDIDS_DEFAULT                  "nand0=gpmi-nand"
 #define        MTDPARTS_DEFAULT                        \
-       "mtdparts=gpmi-nand.0:"                 \
+       "mtdparts=gpmi-nand:"                   \
                "3m(bootloader)ro,"             \
                "512k(environment),"            \
                "512k(redundant-environment),"  \
                "4m(kernel),"                   \
+               "128k(fdt),"                    \
+               "8m(ramdisk),"                  \
                "-(filesystem)"
 #else
 #define        CONFIG_ENV_IS_NOWHERE
@@ -189,7 +191,6 @@
 #ifdef CONFIG_CMD_NET
 #define        CONFIG_ETHPRIME                 "FEC0"
 #define        CONFIG_FEC_MXC
-#define        CONFIG_FEC_MXC_MULTI
 #define        CONFIG_MII
 #define        CONFIG_FEC_XCV_TYPE             RMII
 #endif
@@ -243,21 +244,24 @@
 #ifdef CONFIG_CMD_SPI
 #define        CONFIG_HARD_SPI
 #define        CONFIG_MXS_SPI
+#define        CONFIG_MXS_SPI_DMA_ENABLE
 #define        CONFIG_SPI_HALF_DUPLEX
 #define        CONFIG_DEFAULT_SPI_BUS          2
+#define        CONFIG_DEFAULT_SPI_CS           0
 #define        CONFIG_DEFAULT_SPI_MODE         SPI_MODE_0
 
 /* SPI FLASH */
 #ifdef CONFIG_CMD_SF
 #define        CONFIG_SPI_FLASH
 #define        CONFIG_SPI_FLASH_STMICRO
-#define        CONFIG_SF_DEFAULT_CS            2
+#define        CONFIG_SF_DEFAULT_BUS           2
+#define        CONFIG_SF_DEFAULT_CS            0
+#define        CONFIG_SF_DEFAULT_SPEED         40000000
 #define        CONFIG_SF_DEFAULT_MODE          SPI_MODE_0
-#define        CONFIG_SF_DEFAULT_SPEED         24000000
 
-#define        CONFIG_ENV_SPI_CS               0
 #define        CONFIG_ENV_SPI_BUS              2
-#define        CONFIG_ENV_SPI_MAX_HZ           24000000
+#define        CONFIG_ENV_SPI_CS               0
+#define        CONFIG_ENV_SPI_MAX_HZ           40000000
 #define        CONFIG_ENV_SPI_MODE             SPI_MODE_0
 #endif
 #endif
@@ -269,7 +273,7 @@
 #define        CONFIG_SETUP_MEMORY_TAGS
 #define        CONFIG_BOOTDELAY        3
 #define        CONFIG_BOOTFILE         "uImage"
-#define        CONFIG_BOOTARGS         "console=ttyAM0,115200n8 "
+#define        CONFIG_BOOTARGS         "console=ttyAMA0,115200n8 "
 #define        CONFIG_BOOTCOMMAND      "run bootcmd_net"
 #define        CONFIG_LOADADDR         0x42000000
 #define        CONFIG_SYS_LOAD_ADDR    CONFIG_LOADADDR
@@ -294,7 +298,7 @@
                "if tftp ${update_nand_full_filename} ; then "          \
                "run update_nand_get_fcb_size ; "                       \
                "nand scrub -y 0x0 ${filesize} ; "                      \
-               "nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; "  \
+               "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; "   \
                "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
                "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
                "nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \