summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-05-24 21:01:30 -0400
committerTom Rini <trini@konsulko.com>2015-05-24 21:01:30 -0400
commit980267a1445b7b4d8e8d05ef57799d92ba4a2ee3 (patch)
treef24b717abe1c7bfedc74507e10d2fde540518ad6 /include/configs
parenta84988c76d1dbca2dbe870d6b4f0ad398f287f85 (diff)
parent8fca2d8cb84fb039bb41061f5f5fd9f31cd596c9 (diff)
Merge git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/colibri_vf.h3
-rw-r--r--include/configs/vf610twr.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 414600ac43..804291dfaa 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 05bc7d0d9e..aa310411bf 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