Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86

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

diff --git a/arch/arm/include/asm/arch-am33xx/mem.h b/arch/arm/include/asm/arch-am33xx/mem.h
index aef4e82fc71386932d29d4bb4af4c4f10853c3ff..e7e8c58b0002662c5a74043a4b84508a0170f3a9 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/mem.h
+++ b/arch/arm/include/asm/arch-am33xx/mem.h
@@ -30,6 +30,7 @@
  *
  * Currently valid part Names are (PART):
  * M_NAND - Micron NAND
+ * STNOR - STMicrolelctronics M29W128GL
  */
 #define GPMC_SIZE_256M         0x0
 #define GPMC_SIZE_128M         0x8
@@ -45,6 +46,14 @@
 #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_CONFIG6     0x08070280
+#define STNOR_GPMC_CONFIG7     0x00000F48
+
 /* max number of GPMC Chip Selects */
 #define GPMC_MAX_CS            8
 /* max number of GPMC regs */
@@ -59,9 +68,4 @@
 #define PISMO2_NAND_CS0                7
 #define PISMO2_NAND_CS1                8
 
-/* make it readable for the gpmc_init */
-#define PISMO1_NOR_BASE        FLASH_BASE
-#define PISMO1_NAND_BASE       CONFIG_SYS_NAND_BASE
-#define PISMO1_NAND_SIZE       GPMC_SIZE_256M
-
 #endif /* endif _MEM_H_ */