From 0d92d4a699fb1a39381d98571dc51fb97e5bcf9e Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat, 30 Aug 2008 23:29:57 +0200
Subject: [PATCH] cmd_vfd: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
common/Makefile | 2 +-
common/cmd_vfd.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/Makefile b/common/Makefile
index 8d4a4269520..35477669a78 100644
--- 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 104c3105612..45f427126da 100644
--- 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 */
--
GitLab