diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-11 18:03:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-11 18:03:52 -0400 |
| commit | 5acce685c9227b3d4b48f6fab6a33f6d74ca9c14 (patch) | |
| tree | 1a5c704c996deeccfd79a1b3d8fc65a090e2379a /cmd/nand.c | |
| parent | ef8b7e045ec744dce385cac4b1438c9be6e2bbc8 (diff) | |
| parent | 4a09831ab21e27857c60ef1608d6ad39c7068dd6 (diff) | |
Merge branch '2019-07-11-master-imports'
- spear platform improvements
- Android BCB support
- Cadence PCIe endpoint driver
Diffstat (limited to 'cmd/nand.c')
| -rw-r--r-- | cmd/nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/nand.c b/cmd/nand.c index a22945d144..899d504533 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -846,7 +846,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd, int r; char *s; size_t cnt; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT) image_header_t *hdr; #endif #if defined(CONFIG_FIT) @@ -874,7 +874,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd, bootstage_mark(BOOTSTAGE_ID_NAND_HDR_READ); switch (genimg_get_format ((void *)addr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT) case IMAGE_FORMAT_LEGACY: hdr = (image_header_t *)addr; |