From 41598c82513672b1052c88ce816d98467345141f Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 20 Jun 2016 17:33:39 +0900 Subject: 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 --- configs/3c120_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/3c120_defconfig') diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig index c145caf..b19c956 100644 --- a/configs/3c120_defconfig +++ b/configs/3c120_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard" CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_CPU=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_IMLS is not set -- cgit v1.1