video: add guards around 16bpp/32bbp code

[oweals/u-boot.git] / cmd / fdc.c

diff --git a/cmd/fdc.c b/cmd/fdc.c
index d2281abbda90e92dee738c709e11027a36f202eb..7d4b8296374e2a8b76533bd7f9b4f85ec51f3834 100644 (file)
--- a/cmd/fdc.c
+++ b/cmd/fdc.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 /*
  * Floppy Disk support
@@ -12,6 +11,7 @@
 #include <config.h>
 #include <command.h>
 #include <image.h>
+#include <irq_func.h>
 
 
 #undef FDC_DEBUG
@@ -635,7 +635,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;
@@ -691,7 +691,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);