aboutsummaryrefslogtreecommitdiff
path: root/common/Makefile
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-12-20 18:57:09 -0500
committerWolfgang Denk <wd@denx.de>2011-01-09 18:01:03 +0100
commit52f0aa835fd6caf5f094b551e435f5c9506d61df (patch)
tree28b17dd9e03865ebc7cbc694a6d8a3e82e1243f3 /common/Makefile
parentb9347188729992ef8282a2854889d8dcc25175aa (diff)
config_cmd_defaults.h: new header for common u-boot command defaults
We have config_defaults.h which are random configuration settings that everyone gets by default. We also have config_cmd_default.h which is a recommended list of defaults but boards have to opt into. Now we have config_cmd_defaults.h which is a list of defaults that everyone gets and has to actively opt out of. For now, we populate it with the bootm command which previously was unable to be disabled. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/Makefile')
-rw-r--r--common/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile
index abea91cb7..048df0cbc 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -41,7 +41,7 @@ COBJS-y += xyzModem.o
# core command
COBJS-y += cmd_boot.o
-COBJS-y += cmd_bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += cmd_bootm.o
COBJS-y += cmd_help.o
COBJS-y += cmd_nvedit.o
COBJS-y += cmd_version.o