Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / common / Makefile

diff --git a/common/Makefile b/common/Makefile
index 97c59fe499a26beb8f51ec40435de385023597c1..e08cd3e74d7dc32e29ce79e286d16b07dc1943d8 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -11,14 +11,8 @@ obj-y += init/
 obj-y += main.o
 obj-y += exports.o
 obj-y += hash.o
-ifdef CONFIG_SYS_HUSH_PARSER
-obj-y += cli_hush.o
-endif
-
-# This option is not just y/n - it can have a numeric value
-ifdef CONFIG_BOOTDELAY
-obj-y += autoboot.o
-endif
+obj-$(CONFIG_HUSH_PARSER) += cli_hush.o
+obj-$(CONFIG_AUTOBOOT) += autoboot.o
 
 # This option is not just y/n - it can have a numeric value
 ifdef CONFIG_BOOT_RETRY_TIME