summaryrefslogtreecommitdiff
path: root/include/configs/ti_armv7_keystone2.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-07-11 18:50:29 -0400
committerTom Rini <trini@konsulko.com>2016-07-11 18:50:29 -0400
commitbff97dde8c8cf6fd5f04bb26fca83f61eadc1741 (patch)
tree544f4a0d7d5668388eaf8a157c16cf6bb8ead134 /include/configs/ti_armv7_keystone2.h
parent94fbd3e37d6bdbf5490a185607ca20f862637220 (diff)
parent96907c0fe50a856f66f60ade68864a2d7949bf15 (diff)
downloadu-boot-imx-bff97dde8c8cf6fd5f04bb26fca83f61eadc1741.zip
u-boot-imx-bff97dde8c8cf6fd5f04bb26fca83f61eadc1741.tar.gz
u-boot-imx-bff97dde8c8cf6fd5f04bb26fca83f61eadc1741.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include/configs/ti_armv7_keystone2.h')
-rw-r--r--include/configs/ti_armv7_keystone2.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 2ee26c4..4aa262e 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -89,6 +89,10 @@
#define CONFIG_SYS_SPI2
#define CONFIG_SYS_SPI2_BASE KS2_SPI2_BASE
#define CONFIG_SYS_SPI2_NUM_CS 4
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_DM_SPI
+#undef CONFIG_DM_SPI_FLASH
+#endif
/* Network Configuration */
#define CONFIG_PHYLIB