cmd_vfd: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/common/Makefile b/common/Makefile
index 8d4a4269520fecce1e576b919cdee83cf2af31a5..35477669a7858882cd2536776709b97bc052726c 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -144,7 +144,7 @@ COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
 COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o
 COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
-COBJS-y += cmd_vfd.o
+COBJS-$(CONFIG_VFD) += cmd_vfd.o
 COBJS-$(CONFIG_CMD_DOC) += docecc.o
 COBJS-y += flash.o
 COBJS-y += kgdb.o

diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c
index 104c3105612e5917b746db523e72bdef1f769ed3..45f427126da27cf774c4bfceeba126980041829c 100644 (file)
--- a/common/cmd_vfd.c
+++ b/common/cmd_vfd.c
@@ -75,7 +75,6 @@ U_BOOT_CMD(
 );
 #endif
 
-#ifdef CONFIG_VFD
 int trab_vfd (ulong bitmap)
 {
        uchar *addr;
@@ -103,4 +102,3 @@ int trab_vfd (ulong bitmap)
        transfer_pic(3, addr, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
        return 0;
 }
-#endif /* CONFIG_VFD */