Add Broadcom / Netgear changes from RAXE 1.0.0.48

[project/bcm63xx/u-boot.git] / cmd / nvedit.c

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 49d3b5bdf466276bea6c33479b0b2139ed3160f5..1b5e2f2cf93247668ac387ae837c1b329b8634d1 100644 (file)
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -50,6 +50,7 @@ DECLARE_GLOBAL_DATA_PTR;
        defined(CONFIG_ENV_IS_IN_SATA)          || \
        defined(CONFIG_ENV_IS_IN_SPI_FLASH)     || \
        defined(CONFIG_ENV_IS_IN_REMOTE)        || \
+       defined(CONFIG_ENV_IS_IN_BOOT_MAGIC)    || \
        defined(CONFIG_ENV_IS_IN_UBI)
 
 #define ENV_IS_IN_DEVICE
@@ -59,7 +60,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #if    !defined(ENV_IS_IN_DEVICE)              && \
        !defined(CONFIG_ENV_IS_NOWHERE)
 # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|MMC|FAT|EXT4|\
-NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE
+NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|BOOT_MAGIC|UBI} or CONFIG_ENV_IS_NOWHERE
 #endif
 
 /*