summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-06-20 17:33:39 +0900
committerTom Rini <trini@konsulko.com>2016-06-20 05:19:09 -0400
commit41598c82513672b1052c88ce816d98467345141f (patch)
treed5becad1d40063d826dcd52e4a908363e9e43231 /include
parent2313d48445e59f063ec9a3b4940fe8252737db76 (diff)
downloadblackbird-obmc-uboot-41598c82513672b1052c88ce816d98467345141f.tar.gz
blackbird-obmc-uboot-41598c82513672b1052c88ce816d98467345141f.zip
autoboot: add CONFIG_AUTOBOOT to allow to not compile autoboot.c
Since commit bb597c0eeb7e ("common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option"), CONFIG_BOOTDELAY is defined for all boards. Prior to that commit, it was allowed to unset CONFIG_BOOTDELAY to not compile common/autoboot.c, as described in common/Makefile: # This option is not just y/n - it can have a numeric value ifdef CONFIG_BOOTDELAY obj-y += autoboot.o endif It was a bit odd to enable/disable code with an integer type option, but it was how this option worked before that commit, and several boards actually unset it to opt out of the autoboot feature. This commit adds a new bool option, CONFIG_AUTOBOOT, and makes CONFIG_BOOTDELAY depend on it. I chose "default y" for this option because most boards use the autoboot. I added "# CONFIG_AUTOBOOT is not set" for the boards that had not set CONFIG_BOOTDELAY prior to the bad commit. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include')
-rw-r--r--include/autoboot.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/autoboot.h b/include/autoboot.h
index 3a9059a0b9..c175f91c5a 100644
--- a/include/autoboot.h
+++ b/include/autoboot.h
@@ -12,7 +12,7 @@
#ifndef __AUTOBOOT_H
#define __AUTOBOOT_H
-#ifdef CONFIG_BOOTDELAY
+#ifdef CONFIG_AUTOBOOT
/**
* bootdelay_process() - process the bootd delay
*
OpenPOWER on IntegriCloud