diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-24 21:01:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-24 21:01:30 -0400 |
| commit | 980267a1445b7b4d8e8d05ef57799d92ba4a2ee3 (patch) | |
| tree | f24b717abe1c7bfedc74507e10d2fde540518ad6 /include | |
| parent | a84988c76d1dbca2dbe870d6b4f0ad398f287f85 (diff) | |
| parent | 8fca2d8cb84fb039bb41061f5f5fd9f31cd596c9 (diff) | |
| download | u-boot-980267a1445b7b4d8e8d05ef57799d92ba4a2ee3.zip u-boot-980267a1445b7b4d8e8d05ef57799d92ba4a2ee3.tar.gz u-boot-980267a1445b7b4d8e8d05ef57799d92ba4a2ee3.tar.bz2 | |
Merge git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/colibri_vf.h | 3 | ||||
| -rw-r--r-- | include/configs/vf610twr.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 414600a..804291d 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -50,8 +50,7 @@ /* NAND support */ #define CONFIG_CMD_NAND -#define CONFIG_NAND_VF610_NFC -#define CONFIG_SYS_NAND_SELF_INIT +#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 05bc7d0..aa31041 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -48,12 +48,10 @@ /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS +#define CONFIG_SYS_NAND_ONFI_DETECTION #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_VF610_NFC -#define CONFIG_SYS_NAND_SELF_INIT #define CONFIG_USE_ARCH_MEMCPY -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR |