summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig1
-rw-r--r--common/Makefile5
2 files changed, 2 insertions, 4 deletions
diff --git a/common/Kconfig b/common/Kconfig
index e691145199..ada4ddbe2c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -100,6 +100,7 @@ endmenu
config BOOTDELAY
int "delay in seconds before automatically booting"
default 2
+ depends on AUTOBOOT
help
Delay before automatically running bootcmd;
set to -1 to disable autoboot.
diff --git a/common/Makefile b/common/Makefile
index 97c59fe499..34cb8987eb 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -15,10 +15,7 @@ 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_AUTOBOOT) += autoboot.o
# This option is not just y/n - it can have a numeric value
ifdef CONFIG_BOOT_RETRY_TIME
OpenPOWER on IntegriCloud