From ac60e46e7d316cdcec44d01a7c19e13dedd00b49 Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Wed, 26 Apr 2017 22:27:51 -0600 Subject: [PATCH] Convert CONFIG_CMD_BAT to Kconfig This converts the following to Kconfig: CONFIG_CMD_BAT Signed-off-by: Simon Glass <sjg@chromium.org> --- board/ti/sdp4430/Kconfig | 3 +++ configs/omap4_sdp4430_defconfig | 1 + include/configs/omap4_sdp4430.h | 5 ----- scripts/config_whitelist.txt | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/board/ti/sdp4430/Kconfig b/board/ti/sdp4430/Kconfig index 5826d8fd0b..36f1852821 100644 --- a/board/ti/sdp4430/Kconfig +++ b/board/ti/sdp4430/Kconfig @@ -9,4 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "omap4_sdp4430" +config CMD_BAT + bool "Enable board-specific battery command" + endif diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 727a4504fa..7229142896 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -4,6 +4,7 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_OMAP44XX=y CONFIG_TARGET_OMAP4_SDP4430=y +CONFIG_CMD_BAT=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 072b97ec99..b82ad13489 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -21,11 +21,6 @@ #include <configs/ti_omap4_common.h> -/* Battery Charger */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_BAT 1 -#endif - /* ENV related config options */ #define CONFIG_ENV_IS_IN_MMC 1 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 29b4032e98..caea65b1a5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -393,7 +393,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_BAT CONFIG_CMD_BEDBUG CONFIG_CMD_BLOB CONFIG_CMD_BMODE -- 2.39.5