With the addition of Kconfig now having CONFIG_TWL4030_POWER and with that being the default when OMAP34XX is selected, this is no longer needed in include/configs and can be removed from the whitelist.
This has only been tested on logic PD DM3730 using ti_omap3_common.h
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 8e6571b..8d15c78 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -109,7 +109,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED
/* diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index e99968c..c2c02b1 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -128,7 +128,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED #define CONFIG_TWL4030_KEYPAD
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 329dc73..bf5b2f5 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -89,7 +89,6 @@ #define CONFIG_SDRC /* The chip has SDRC controller */
#define CONFIG_OMAP3_EVM /* This is a OMAP3 EVM */ -#define CONFIG_TWL4030_POWER /* with TWL4030 PMIC */
/* * Clock related definitions diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 6ddb83f..5214827 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -83,12 +83,6 @@ #define CONFIG_I2C_MULTI_BUS
/* - * Power - */ - -#define CONFIG_TWL4030_POWER - -/* * Input */
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 3f2da57..3ea2caf 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -90,7 +90,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED
/* diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 0147662..393d867 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -58,9 +58,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
-/* TWL4030 */ -#define CONFIG_TWL4030_POWER - /* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index fc70be1..9741ca5 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -82,7 +82,6 @@ #define CONFIG_SYS_EEPROM_BUS_NUM 1
/* TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED
/* Board NAND Info */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5e515d2..d39a16e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -6360,7 +6360,6 @@ CONFIG_TUXX1 CONFIG_TWL4030_INPUT CONFIG_TWL4030_KEYPAD CONFIG_TWL4030_LED -CONFIG_TWL4030_POWER CONFIG_TWL4030_PWM CONFIG_TWL4030_USB CONFIG_TWL6030_INPUT