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/disk.c | |
parent | 27eb177b393e19af9716a2fa4969cd7b26ac3dc2 (diff) | |
download | u-boot-c76c93a3d5a921152e27aa7adb3bbcf9ec4015e1.zip u-boot-c76c93a3d5a921152e27aa7adb3bbcf9ec4015e1.tar.gz u-boot-c76c93a3d5a921152e27aa7adb3bbcf9ec4015e1.tar.bz2 |
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/disk.c')
-rw-r--r-- | cmd/disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -15,7 +15,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, ulong addr = CONFIG_SYS_LOAD_ADDR; ulong cnt; disk_partition_t info; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT) image_header_t *hdr; #endif struct blk_desc *dev_desc; @@ -62,7 +62,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, bootstage_mark(BOOTSTAGE_ID_IDE_PART_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; |