summaryrefslogtreecommitdiff
path: root/include/configs/tseries.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-08-29 13:47:42 -0400
committerTom Rini <trini@ti.com>2014-08-29 13:47:42 -0400
commit6defdc0b5552ab1af4a66a8abac8196cbb6b9e15 (patch)
treea9c7640fc7e771696ac134018e9aebc5b7f6c3e4 /include/configs/tseries.h
parent8f005b3918cc16bb3e8f6d7228c27d207f4c606f (diff)
parentb640b460f54caf74ce21e8797a29379a5267eb4f (diff)
downloadu-boot-imx-6defdc0b5552ab1af4a66a8abac8196cbb6b9e15.zip
u-boot-imx-6defdc0b5552ab1af4a66a8abac8196cbb6b9e15.tar.gz
u-boot-imx-6defdc0b5552ab1af4a66a8abac8196cbb6b9e15.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'include/configs/tseries.h')
-rw-r--r--include/configs/tseries.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/tseries.h b/include/configs/tseries.h
index 1fd6e32..1dd13fd 100644
--- a/include/configs/tseries.h
+++ b/include/configs/tseries.h
@@ -243,8 +243,12 @@
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#elif defined(CONFIG_NAND)
-#undef CONFIG_ENV_IS_NOWHERE
+/* No NAND env support in SPL */
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_ENV_IS_NOWHERE
+#else
#define CONFIG_ENV_IS_IN_NAND
+#endif
#define CONFIG_ENV_OFFSET 0x120000 /* TODO: Adresse definieren */
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_ENV_SIZE
#else