diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-23 07:14:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-11 14:11:18 -0400 |
| commit | c76c93a3d5a921152e27aa7adb3bbcf9ec4015e1 (patch) | |
| tree | 65673aa7fad7d4a7ac97768d5a3837ff1affd82e /cmd/ximg.c | |
| parent | 27eb177b393e19af9716a2fa4969cd7b26ac3dc2 (diff) | |
configs: Rename CONFIG_IMAGE_FORMAT_LEGACY to CONFIG_LEGACY_IMAGE_FORMAT
The name CONFIG_LEGACY_IMAGE_FORMAT reads slightly better along with
allowing us to avoid a rather nasty Kbuild/Kconfig issue down the line
with CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY). In a few places outside of
cmd/ switch to using CONFIG_IS_ENABLED() to test what is set.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'cmd/ximg.c')
| -rw-r--r-- | cmd/ximg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ximg.c b/cmd/ximg.c index 32bfae8b22..9e53cc4557 100644 --- a/cmd/ximg.c +++ b/cmd/ximg.c @@ -35,7 +35,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) ulong data, len; int verify; int part = 0; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT) ulong count; image_header_t *hdr = NULL; #endif @@ -67,7 +67,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } switch (genimg_get_format((void *)addr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT) case IMAGE_FORMAT_LEGACY: printf("## Copying part %d from legacy image " @@ -217,7 +217,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } break; #endif -#if defined(CONFIG_BZIP2) && defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if defined(CONFIG_BZIP2) && defined(CONFIG_LEGACY_IMAGE_FORMAT) case IH_COMP_BZIP2: { int i; |