summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-23 08:13:46 -0500
committerTom Rini <trini@konsulko.com>2016-02-23 08:13:46 -0500
commitb625fab7069cab52fd8e0c3dbb25e0d04d020173 (patch)
tree13d5c94c6c36724136264a4c3b9764583eace1c4 /include/configs
parentbed6bd326e89366152609821a752d361b2183b46 (diff)
parent674f3609aad39f099a5c3605643a6be124504b96 (diff)
downloadu-boot-imx-b625fab7069cab52fd8e0c3dbb25e0d04d020173.zip
u-boot-imx-b625fab7069cab52fd8e0c3dbb25e0d04d020173.tar.gz
u-boot-imx-b625fab7069cab52fd8e0c3dbb25e0d04d020173.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/zynq-common.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 638be2f..4a81d41 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -197,7 +197,11 @@
/* Environment */
#ifndef CONFIG_ENV_IS_NOWHERE
# ifndef CONFIG_SYS_NO_FLASH
+/* Environment in NOR flash */
# define CONFIG_ENV_IS_IN_FLASH
+# elif defined(CONFIG_ZYNQ_QSPI)
+/* Environment in Serial Flash */
+# define CONFIG_ENV_IS_IN_SPI_FLASH
# elif defined(CONFIG_SYS_NO_FLASH)
# define CONFIG_ENV_IS_NOWHERE
# endif