summaryrefslogtreecommitdiff
path: root/cmd/fdc.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-05-23 14:14:07 +0300
committerTom Rini <trini@konsulko.com>2019-07-11 21:11:18 +0300
commitc76c93a3d5a921152e27aa7adb3bbcf9ec4015e1 (patch)
tree65673aa7fad7d4a7ac97768d5a3837ff1affd82e /cmd/fdc.c
parent27eb177b393e19af9716a2fa4969cd7b26ac3dc2 (diff)
downloadu-boot-c76c93a3d5a921152e27aa7adb3bbcf9ec4015e1.tar.xz
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/fdc.c')
-rw-r--r--cmd/fdc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/fdc.c b/cmd/fdc.c
index 906845d404..7bfaae0e38 100644
--- a/cmd/fdc.c
+++ b/cmd/fdc.c
@@ -634,7 +634,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
FD_GEO_STRUCT *pFG = (FD_GEO_STRUCT *)floppy_type;
FDC_COMMAND_STRUCT *pCMD = &cmd;
unsigned long addr,imsize;
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
image_header_t *hdr; /* used for fdc boot */
#endif
unsigned char boot_drive;
@@ -690,7 +690,7 @@ int do_fdcboot (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:
hdr = (image_header_t *)addr;
image_print_contents (hdr);