summaryrefslogtreecommitdiff
path: root/common/Makefile
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-05 21:04:36 -0500
committerWolfgang Denk <wd@denx.de>2009-02-11 23:05:57 +0100
commite915f8bb73d74178bc21d3a457959883b1afd1c0 (patch)
tree4b864d952f7c8cab0e0b8c9758cadac843b389e8 /common/Makefile
parentab76e9848a1f4db64d14233741d739a3b3360c93 (diff)
downloadu-boot-imx-e915f8bb73d74178bc21d3a457959883b1afd1c0.zip
u-boot-imx-e915f8bb73d74178bc21d3a457959883b1afd1c0.tar.gz
u-boot-imx-e915f8bb73d74178bc21d3a457959883b1afd1c0.tar.bz2
common/{hush, kgdb, serial}.c: build by COBJS-$(...) in Makefile
Move global '#ifdef CONFIG_xxx .... #endif' out of the .c files and into the COBJS-$(CONFIG_xxx) in the Makefile. Also delete unused var in kgdb code in the process. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/Makefile')
-rw-r--r--common/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/Makefile b/common/Makefile
index 93e3963..f13cd11 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -35,11 +35,11 @@ COBJS-y += command.o
COBJS-y += devices.o
COBJS-y += dlmalloc.o
COBJS-y += exports.o
-COBJS-y += hush.o
+COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
COBJS-y += image.o
COBJS-y += memsize.o
COBJS-y += s_record.o
-COBJS-y += serial.o
+COBJS-$(CONFIG_SERIAL_MULTI) += serial.o
COBJS-y += xyzModem.o
# core command
@@ -144,7 +144,7 @@ COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o
COBJS-$(CONFIG_CMD_DOC) += docecc.o
COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
COBJS-y += flash.o
-COBJS-y += kgdb.o
+COBJS-$(CONFIG_CMD_KGDB) += kgdb.o
COBJS-$(CONFIG_LCD) += lcd.o
COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o
COBJS-$(CONFIG_UPDATE_TFTP) += update.o