diff options
| author | Tom Rini <trini@ti.com> | 2012-09-18 07:55:07 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-18 07:55:07 -0700 |
| commit | c413a004ea62d0ff150c85615348c59ea456bb34 (patch) | |
| tree | 8caa6ccf4f53821b723a75a82436daa9464769b0 /include/configs | |
| parent | 037e9d33db9fc86c1e671d64077b2d1a19df7f24 (diff) | |
| parent | 9c60e75e05dab5a0197728b6a940aaac02762936 (diff) | |
| download | u-boot-imx-c413a004ea62d0ff150c85615348c59ea456bb34.zip u-boot-imx-c413a004ea62d0ff150c85615348c59ea456bb34.tar.gz u-boot-imx-c413a004ea62d0ff150c85615348c59ea456bb34.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/flea3.h | 1 | ||||
| -rw-r--r-- | include/configs/mx35pdk.h | 1 | ||||
| -rw-r--r-- | include/configs/tx25.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 4350518..027a5dc 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -213,7 +213,6 @@ * NAND FLASH driver setup */ #define CONFIG_NAND_MXC -#define CONFIG_NAND_MXC_V1_1 #define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR) diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 9bc6bd4..5816152 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -231,7 +231,6 @@ * NAND FLASH driver setup */ #define CONFIG_NAND_MXC -#define CONFIG_NAND_MXC_V1_1 #define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR) diff --git a/include/configs/tx25.h b/include/configs/tx25.h index c8a49bb..71b1d32 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -107,7 +107,6 @@ /* NAND */ #define CONFIG_NAND_MXC -#define CONFIG_NAND_MXC_V1_1 #define CONFIG_MXC_NAND_REGS_BASE (0xBB000000) #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE (0xBB000000) |