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

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

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c52755e3caf33b5fff7957bcc44526f62c0ccf23..9eb2a547fc487ce2fb1201c83583abe21c99fa15 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -20,8 +20,6 @@
 #ifndef __M28EVK_CONFIG_H__
 #define __M28EVK_CONFIG_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */
@@ -36,9 +34,9 @@
 
 #define        CONFIG_MACH_TYPE        MACH_TYPE_M28EVK
 
+#include <asm/arch/regs-base.h>
+
 #define        CONFIG_SYS_NO_FLASH
-#define        CONFIG_SYS_ICACHE_OFF
-#define        CONFIG_SYS_DCACHE_OFF
 #define        CONFIG_BOARD_EARLY_INIT_F
 #define        CONFIG_ARCH_MISC_INIT
 
@@ -173,9 +171,9 @@
 #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),"  \
@@ -245,6 +243,7 @@
 #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_MODE         SPI_MODE_0
@@ -255,11 +254,11 @@
 #define        CONFIG_SPI_FLASH_STMICRO
 #define        CONFIG_SF_DEFAULT_CS            2
 #define        CONFIG_SF_DEFAULT_MODE          SPI_MODE_0
-#define        CONFIG_SF_DEFAULT_SPEED         24000000
+#define        CONFIG_SF_DEFAULT_SPEED         40000000
 
 #define        CONFIG_ENV_SPI_CS               0
 #define        CONFIG_ENV_SPI_BUS              2
-#define        CONFIG_ENV_SPI_MAX_HZ           24000000
+#define        CONFIG_ENV_SPI_MAX_HZ           40000000
 #define        CONFIG_ENV_SPI_MODE             SPI_MODE_0
 #endif
 #endif