diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-12 12:22:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-12 12:22:43 -0400 |
| commit | 40a9546c7b6217a78a3a010a0142529a837e46b6 (patch) | |
| tree | 87ef70a898d33b0f2b9194f3f96f1283a6325c16 /env/nand.c | |
| parent | 02f173ca156cee8526dff87603d5e446b443cde3 (diff) | |
| parent | d2c05f50e12f87128597a28146de7092aaa847c3 (diff) | |
Merge branch '2019-04-11-ti-master-imports'
- Improve Keystone 3 SoC support (DMA, TI SCI)
- Improve Keystone 2 SoC support (PHY fixes on various platforms)
- Improve am335x families (new platforms, more boot mode options in SPL
via DM).
- General DaVinci, OMAP5 fixes.
Diffstat (limited to 'env/nand.c')
| -rw-r--r-- | env/nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/env/nand.c b/env/nand.c index 29eda66fad8..d0b95f483d3 100644 --- a/env/nand.c +++ b/env/nand.c @@ -26,7 +26,7 @@ #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND) && \ !defined(CONFIG_SPL_BUILD) #define CMD_SAVEENV -#elif defined(CONFIG_ENV_OFFSET_REDUND) +#elif defined(CONFIG_ENV_OFFSET_REDUND) && !defined(CONFIG_SPL_BUILD) #error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND #endif |