diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/disk.c | 6 | ||||
| -rw-r--r-- | cmd/nvedit.c | 3 |
2 files changed, 5 insertions, 4 deletions
@@ -22,7 +22,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, #endif block_dev_desc_t *dev_desc; -#if defined(CONFIG_FIT) +#if CONFIG_IS_ENABLED(FIT) const void *fit_hdr = NULL; #endif @@ -82,7 +82,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, cnt = image_get_image_size(hdr); break; #endif -#if defined(CONFIG_FIT) +#if CONFIG_IS_ENABLED(FIT) case IMAGE_FORMAT_FIT: fit_hdr = (const void *) addr; puts("Fit image detected...\n"); @@ -108,7 +108,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, } bootstage_mark(BOOTSTAGE_ID_IDE_READ); -#if defined(CONFIG_FIT) +#if CONFIG_IS_ENABLED(FIT) /* This cannot be done earlier, * we need complete FIT image in RAM first */ if (genimg_get_format((void *) addr) == IMAGE_FORMAT_FIT) { diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 5ae9d9d..9cf884e 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -45,6 +45,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \ !defined(CONFIG_ENV_IS_IN_MMC) && \ !defined(CONFIG_ENV_IS_IN_FAT) && \ + !defined(CONFIG_ENV_IS_IN_EXT4) && \ !defined(CONFIG_ENV_IS_IN_NAND) && \ !defined(CONFIG_ENV_IS_IN_NVRAM) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \ @@ -53,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_UBI) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|NVRAM|MMC|FAT|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE +SPI_FLASH|NVRAM|MMC|FAT|EXT4|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE #endif /* |