diff --git a/board/ti/sdp4430/Kconfig b/board/ti/sdp4430/Kconfig
index 5826d8fd0b214646a3ce0bf88a6ff8ffb2b98543..36f185282166fafbaf2d147f20e0e8c4b0a8c0e8 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 727a4504fa21fe8985be6cb5797328983cc4eaac..722914289603c22bc2a29f57039b869d2a6a692b 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 072b97ec99e9c4dabf3406005b96bf2d546716f9..b82ad13489cf8cacf246edea2fd21d36dc3ab3ed 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 29b4032e98ef441010846ebfd0345be395f7ab5b..caea65b1a576b41b4f656f48e9f8966e7f59020f 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