summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-29 21:53:37 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-29 21:53:37 +0200
commit81789c39db3f0f6b621df8c0ec66014d701f368e (patch)
treef435a9192c2a7d991bc3b6ed4e9e8df28896ab92
parentbbf52df9aa94ffb115b8b1ebeb00d01374bb0a1d (diff)
downloadu-boot-imx-81789c39db3f0f6b621df8c0ec66014d701f368e.zip
u-boot-imx-81789c39db3f0f6b621df8c0ec66014d701f368e.tar.gz
u-boot-imx-81789c39db3f0f6b621df8c0ec66014d701f368e.tar.bz2
autoscript: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--common/Makefile3
-rw-r--r--common/cmd_autoscript.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/common/Makefile b/common/Makefile
index 0c8ef5b..918b908 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -31,7 +31,7 @@ COBJS-y += main.o
COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o
COBJS-y += circbuf.o
COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o
-COBJS-y += cmd_autoscript.o
+COBJS-$(CONFIG_AUTOSCRIPT)$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o
COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
COBJS-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o
COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
@@ -148,6 +148,7 @@ COBJS-$(CONFIG_MP) += cmd_mp.o
COBJS-$(CONFIG_CMD_SF) += cmd_sf.o
COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o
+COBJS-y += $(COBJS-yy)
COBJS := $(COBJS-y)
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c
index 13af93e..c2e7e66 100644
--- a/common/cmd_autoscript.c
+++ b/common/cmd_autoscript.c
@@ -47,8 +47,6 @@
#include <hush.h>
#endif
-#if defined(CONFIG_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
-
int
autoscript (ulong addr, const char *fit_uname)
{
@@ -200,8 +198,6 @@ autoscript (ulong addr, const char *fit_uname)
return rcode;
}
-#endif
-
/**************************************************/
#if defined(CONFIG_CMD_AUTOSCRIPT)
int