diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
commit | 5ed28948a3ffe6c735386e59c132989869beaa3e (patch) | |
tree | cbb940a4fa90b89abdd57d6b13d64351cfce839c /arch/arm/include/asm/arch-omap3/mem.h | |
parent | e6607cffef965011ef0ddc0fbe6f4b7c0d53aeec (diff) | |
parent | 83bad1026b9e3a4f6b7783cc1cbb434c1bbd3fa2 (diff) |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-omap3/mem.h')
-rw-r--r-- | arch/arm/include/asm/arch-omap3/mem.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h index bdb1435291..d2dfb1e19a 100644 --- a/arch/arm/include/asm/arch-omap3/mem.h +++ b/arch/arm/include/asm/arch-omap3/mem.h @@ -354,14 +354,6 @@ enum { #define GPMC_CS_ENABLE 0x1 -#define SMNAND_GPMC_CONFIG1 0x00000800 -#define SMNAND_GPMC_CONFIG2 0x00141400 -#define SMNAND_GPMC_CONFIG3 0x00141400 -#define SMNAND_GPMC_CONFIG4 0x0F010F01 -#define SMNAND_GPMC_CONFIG5 0x010C1414 -#define SMNAND_GPMC_CONFIG6 0x1F0F0A80 -#define SMNAND_GPMC_CONFIG7 0x00000C44 - #define M_NAND_GPMC_CONFIG1 0x00001800 #define M_NAND_GPMC_CONFIG2 0x00141400 #define M_NAND_GPMC_CONFIG3 0x00141400 |