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

[oweals/u-boot.git] / arch / arm / include / asm / arch-omap5 / mem.h

diff --git a/arch/arm/include/asm/arch-omap5/mem.h b/arch/arm/include/asm/arch-omap5/mem.h
index d2e708bba5281224b8d0461157f22ea1b65cfbb9..3e5d655de928e53c07d63548ada8797d85924d3b 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/mem.h
+++ b/arch/arm/include/asm/arch-omap5/mem.h
@@ -46,13 +46,13 @@
 #define M_NAND_GPMC_CONFIG6    0x16000f80
 #define M_NAND_GPMC_CONFIG7    0x00000008
 
-#define STNOR_GPMC_CONFIG1     0x00001200
-#define STNOR_GPMC_CONFIG2     0x00101000
-#define STNOR_GPMC_CONFIG3     0x00030301
-#define STNOR_GPMC_CONFIG4     0x10041004
-#define STNOR_GPMC_CONFIG5     0x000C1010
+#define STNOR_GPMC_CONFIG1     0x00001000
+#define STNOR_GPMC_CONFIG2     0x001f1f00
+#define STNOR_GPMC_CONFIG3     0x001f1f01
+#define STNOR_GPMC_CONFIG4     0x1f011f01
+#define STNOR_GPMC_CONFIG5     0x001d1f1f
 #define STNOR_GPMC_CONFIG6     0x08070280
-#define STNOR_GPMC_CONFIG7     0x00000F48
+#define STNOR_GPMC_CONFIG7     0x00000048
 
 /* max number of GPMC Chip Selects */
 #define GPMC_MAX_CS            8