ti_config_fragments: baseport: Move option pruning into prune.cfg

While pruning is useful for making small and fast-building kernels for
our SDK releases, these are not so useful for general purpose or distro
kernels where these options might still be needed.

For these cases one would only want to apply our additions to gain
support for our platforms but not trim out support for others. To make
this separation clean, move all the pruning from baseport.cfg into
multi_v7_prune.cfg.

Signed-off-by: Andrew Davis <afd@ti.com>

2 files changed, 48 insertions, 227 deletions

diff --git a/ti_config_fragments/baseport.cfg b/ti_config_fragments/baseport.cfg
index 8b51c7a6c81a..c26ff3b8b4b5 100644
--- a/ti_config_fragments/baseport.cfg
+++ b/ti_config_fragments/baseport.cfg
@@ -170,16 +170,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_SI5351=n
-CONFIG_COMMON_CLK_SI514=n
-CONFIG_COMMON_CLK_SI570=n
-CONFIG_COMMON_CLK_CDCE925=n
-CONFIG_CLK_TWL6040=n
-CONFIG_CLK_QORIQ=n
 CONFIG_COMMON_CLK_PALMAS=y
-CONFIG_COMMON_CLK_PWM=n
-CONFIG_COMMON_CLK_PXA=n
-CONFIG_COMMON_CLK_CDCE706=n
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_PROBE=y
 CONFIG_CLKSRC_MMIO=y
@@ -281,166 +272,31 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_PINCTRL_TI_IODELAY=y
 CONFIG_PINCTRL_SINGLE=y
 
-#
 # Multifunction device drivers
 CONFIG_MFD_CORE=y
-CONFIG_MFD_AS3711=n
-CONFIG_MFD_AS3722=n
-CONFIG_PMIC_ADP5520=n
-CONFIG_MFD_AAT2870_CORE=n
-CONFIG_MFD_ATMEL_FLEXCOM=n
-CONFIG_MFD_ATMEL_HLCDC=n
-CONFIG_MFD_BCM590XX=n
-CONFIG_MFD_AXP20X=n
-CONFIG_MFD_AXP20X_I2C=n
-CONFIG_MFD_CROS_EC=n
-CONFIG_MFD_CROS_EC_I2C=n
-CONFIG_MFD_CROS_EC_SPI=n
-CONFIG_MFD_ASIC3=n
-CONFIG_PMIC_DA903X=n
-CONFIG_MFD_DA9052_SPI=n
-CONFIG_MFD_DA9052_I2C=n
-CONFIG_MFD_DA9055=n
-CONFIG_MFD_DA9062=n
-CONFIG_MFD_DA9063=n
-CONFIG_MFD_DA9150=n
-CONFIG_MFD_DLN2=n
-CONFIG_MFD_MC13XXX_SPI=n
-CONFIG_MFD_MC13XXX_I2C=n
-CONFIG_MFD_HI6421_PMIC=n
-CONFIG_HTC_EGPIO=n
-CONFIG_HTC_PASIC3=n
-CONFIG_HTC_I2CPLD=n
-CONFIG_LPC_ICH=n
-CONFIG_LPC_SCH=n
-CONFIG_INTEL_SOC_PMIC=n
-CONFIG_MFD_JANZ_CMODIO=n
-CONFIG_MFD_KEMPLD=n
-CONFIG_MFD_88PM800=n
-CONFIG_MFD_88PM805=n
-CONFIG_MFD_88PM860X=n
-CONFIG_MFD_MAX14577=n
-CONFIG_MFD_MAX77686=n
-CONFIG_MFD_MAX77693=n
-CONFIG_MFD_MAX77843=n
-CONFIG_MFD_MAX8907=n
-CONFIG_MFD_MAX8925=n
-CONFIG_MFD_MAX8997=n
-CONFIG_MFD_MAX8998=n
-CONFIG_MFD_MT6397=n
-CONFIG_MFD_MENF21BMC=n
-CONFIG_EZX_PCAP=n
-CONFIG_MFD_VIPERBOARD=n
-CONFIG_MFD_RETU=n
-CONFIG_MFD_PCF50633=n
-CONFIG_MFD_PM8XXX=n
-CONFIG_MFD_PM8921_CORE=n
-CONFIG_MFD_RDC321X=n
-CONFIG_MFD_RTSX_PCI=n
-CONFIG_MFD_RT5033=n
-CONFIG_MFD_RTSX_USB=n
-CONFIG_MFD_RC5T583=n
-CONFIG_MFD_RK808=n
-CONFIG_MFD_RN5T618=n
-CONFIG_MFD_SEC_CORE=n
-CONFIG_MFD_SI476X_CORE=n
-CONFIG_MFD_SM501=n
-CONFIG_MFD_SKY81452=n
-CONFIG_MFD_SMSC=n
-CONFIG_ABX500_CORE=n
-CONFIG_AB3100_CORE=n
-CONFIG_MFD_STMPE=n
-CONFIG_STMPE_I2C=n
-CONFIG_STMPE_SPI=n
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=n
-CONFIG_MFD_LP8788=n
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PALMAS=y
-CONFIG_TPS6105X=n
-CONFIG_TPS65010=n
-CONFIG_TPS6507X=n
-CONFIG_MFD_TPS65086=n
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65217=y
 CONFIG_MFD_TPS65218=y
 CONFIG_MFD_TPS65219=m
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
-CONFIG_MFD_TPS65912_I2C=n
-CONFIG_MFD_TPS65912_SPI=n
-CONFIG_MFD_TPS80031=n
-CONFIG_TWL4030_CORE=n
-CONFIG_TWL4030_POWER=n
-CONFIG_MFD_TWL4030_AUDIO=n
 CONFIG_TWL6040_CORE=y
-CONFIG_MFD_WL1273_CORE=n
-CONFIG_MFD_LM3533=n
 CONFIG_MFD_TI_LP873X=y
 CONFIG_MFD_TI_LP87565=y
-CONFIG_MFD_TC3589X=n
-CONFIG_MFD_TMIO=n
-CONFIG_MFD_T7L66XB=n
-CONFIG_MFD_TC6387XB=n
-CONFIG_MFD_TC6393XB=n
-CONFIG_MFD_VX855=n
-CONFIG_MFD_ARIZONA_I2C=n
-CONFIG_MFD_ARIZONA_SPI=n
-CONFIG_MFD_WM8400=n
-CONFIG_MFD_WM831X_I2C=n
-CONFIG_MFD_WM831X_SPI=n
-CONFIG_MFD_WM8350_I2C=n
-CONFIG_MFD_WM8994=n
-CONFIG_MFD_VEXPRESS_SYSREG=n
 
 # Regulators
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_DEBUG=n
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=n
-CONFIG_REGULATOR_USERSPACE_CONSUMER=n
-CONFIG_REGULATOR_ACT8865=n
-CONFIG_REGULATOR_AD5398=n
-CONFIG_REGULATOR_ANATOP=n
-CONFIG_REGULATOR_AS3711=n
-CONFIG_REGULATOR_AS3722=n
-CONFIG_REGULATOR_AXP20X=n
-CONFIG_REGULATOR_BCM590XX=n
-CONFIG_REGULATOR_DA9210=n
-CONFIG_REGULATOR_DA9211=n
-CONFIG_REGULATOR_FAN53555=n
 CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_ISL9305=n
-CONFIG_REGULATOR_ISL6271A=n
-CONFIG_REGULATOR_LP3971=n
-CONFIG_REGULATOR_LP3972=n
-CONFIG_REGULATOR_LP872X=n
-CONFIG_REGULATOR_LP8755=n
 CONFIG_REGULATOR_LP873X=y
 CONFIG_REGULATOR_LP87565=y
-CONFIG_REGULATOR_LTC3589=n
-CONFIG_REGULATOR_MAX14577=n
-CONFIG_REGULATOR_MAX1586=n
-CONFIG_REGULATOR_MAX8649=n
-CONFIG_REGULATOR_MAX8660=n
-CONFIG_REGULATOR_MAX8907=n
-CONFIG_REGULATOR_MAX8952=n
-CONFIG_REGULATOR_MAX8973=n
-CONFIG_REGULATOR_MAX77686=n
-CONFIG_REGULATOR_MAX77693=n
-CONFIG_REGULATOR_MAX77802=n
-CONFIG_REGULATOR_MT6311=n
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=y
-CONFIG_REGULATOR_PFUZE100=n
-CONFIG_REGULATOR_PWM=n
-CONFIG_REGULATOR_RK808=n
-CONFIG_REGULATOR_S2MPA01=n
-CONFIG_REGULATOR_S2MPS11=n
-CONFIG_REGULATOR_S5M8767=n
 CONFIG_REGULATOR_TI_ABB=y
-CONFIG_REGULATOR_TPS51632=n
 CONFIG_REGULATOR_TPS62360=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
@@ -451,8 +307,6 @@ CONFIG_REGULATOR_TPS65219=m
 CONFIG_REGULATOR_TPS6524X=y
 CONFIG_REGULATOR_TPS6586X=y
 CONFIG_REGULATOR_TPS65910=y
-CONFIG_REGULATOR_TWL4030=n
-CONFIG_REGULATOR_VEXPRESS=n
 
 # Push Button
 CONFIG_INPUT_TPS65219_PWRBUTTON=m
@@ -469,77 +323,13 @@ CONFIG_CRYPTO_SHA256_ARM=m
 CONFIG_CRYPTO_SHA512_ARM=m
 CONFIG_CRYPTO_AES_ARM_BS=m
 
-#
 # RTC drivers
-#
-CONFIG_RTC_DRV_ABB5ZES3=n
-CONFIG_RTC_DRV_ABX80X=n
 CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=n
-CONFIG_RTC_DRV_DS1672=n
-CONFIG_RTC_DRV_DS3232=n
-CONFIG_RTC_DRV_HYM8563=n
-CONFIG_RTC_DRV_MAX6900=n
-CONFIG_RTC_DRV_RS5C372=n
-CONFIG_RTC_DRV_ISL1208=n
-CONFIG_RTC_DRV_ISL12022=n
-CONFIG_RTC_DRV_ISL12057=n
-CONFIG_RTC_DRV_X1205=n
 CONFIG_RTC_DRV_PALMAS=m
-CONFIG_RTC_DRV_PCF2127=n
-CONFIG_RTC_DRV_PCF8523=n
-CONFIG_RTC_DRV_PCF8563=n
-CONFIG_RTC_DRV_PCF85063=n
-CONFIG_RTC_DRV_PCF8583=n
-CONFIG_RTC_DRV_M41T80=n
-CONFIG_RTC_DRV_BQ32K=n
 CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_TWL92330=y
-CONFIG_RTC_DRV_TWL4030=n
-CONFIG_RTC_DRV_S35390A=n
-CONFIG_RTC_DRV_FM3130=n
-CONFIG_RTC_DRV_RX8581=n
-CONFIG_RTC_DRV_RX8025=n
-CONFIG_RTC_DRV_EM3027=n
-CONFIG_RTC_DRV_RV3029C2=n
-CONFIG_RTC_DRV_RV8803=n
-
-CONFIG_RTC_DRV_M41T93=n
-CONFIG_RTC_DRV_M41T94=n
-CONFIG_RTC_DRV_DS1305=n
-CONFIG_RTC_DRV_DS1343=n
-CONFIG_RTC_DRV_DS1347=n
-CONFIG_RTC_DRV_DS1390=n
-CONFIG_RTC_DRV_MAX6902=n
-CONFIG_RTC_DRV_R9701=n
-CONFIG_RTC_DRV_RS5C348=n
-CONFIG_RTC_DRV_DS3234=n
-CONFIG_RTC_DRV_PCF2123=n
-CONFIG_RTC_DRV_RX4581=n
-CONFIG_RTC_DRV_MCP795=n
-
-CONFIG_RTC_DRV_CMOS=n
-CONFIG_RTC_DRV_DS1286=n
-CONFIG_RTC_DRV_DS1511=n
-CONFIG_RTC_DRV_DS1553=n
-CONFIG_RTC_DRV_DS1685_FAMILY=n
-CONFIG_RTC_DRV_DS1742=n
-CONFIG_RTC_DRV_DS2404=n
-CONFIG_RTC_DRV_STK17TA8=n
-CONFIG_RTC_DRV_M48T86=n
-CONFIG_RTC_DRV_M48T35=n
-CONFIG_RTC_DRV_M48T59=n
-CONFIG_RTC_DRV_MSM6242=n
-CONFIG_RTC_DRV_BQ4802=n
-CONFIG_RTC_DRV_RP5C01=n
-CONFIG_RTC_DRV_V3020=n
-CONFIG_RTC_DRV_ZYNQMP=n
-
 CONFIG_RTC_DRV_OMAP=m
-CONFIG_RTC_DRV_SNVS=n
-
-CONFIG_RTC_DRV_HID_SENSOR_TIME=n
 
 # WatchDog
 CONFIG_WATCHDOG=y
@@ -547,18 +337,8 @@ CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=n
 
 # Watchdog Device Drivers
-CONFIG_SOFT_WATCHDOG=n
-CONFIG_GPIO_WATCHDOG=n
-CONFIG_XILINX_WATCHDOG=n
-CONFIG_CADENCE_WATCHDOG=n
-CONFIG_DW_WATCHDOG=n
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=n
-CONFIG_ALIM7101_WDT=n
-CONFIG_I6300ESB_WDT=n
-CONFIG_BCM7038_WDT=n
-CONFIG_MEN_A21_WDT=n
 
 # No Staging drivers please
 CONFIG_STAGING=n
@@ -569,13 +349,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_DAVINCI=y
 
-# GPIO disable unused options
-CONFIG_GPIO_DWAPB=n
-CONFIG_GPIO_EM=n
-CONFIG_GPIO_GENERIC_PLATFORM=n
-CONFIG_GPIO_XILINX=n
-CONFIG_GPIO_TPS6586X=n
-
 # Enable options to facilitate testing
 CONFIG_CRYPTO_TEST=m
 CONFIG_RTC_DEBUG=y
diff --git a/ti_config_fragments/multi_v7_prune.cfg b/ti_config_fragments/multi_v7_prune.cfg
index 875ed836b078..039f56b85af0 100644
--- a/ti_config_fragments/multi_v7_prune.cfg
+++ b/ti_config_fragments/multi_v7_prune.cfg
@@ -71,3 +71,51 @@ CONFIG_SOC_AM33XX=n
 CONFIG_SOC_AM43XX=n
 CONFIG_SOC_DRA7XX=n
 CONFIG_ARCH_KEYSTONE=n
+
+# Multifunction device drivers
+CONFIG_MFD_AS3711=n
+CONFIG_MFD_AS3722=n
+CONFIG_MFD_ATMEL_FLEXCOM=n
+CONFIG_MFD_ATMEL_HLCDC=n
+CONFIG_MFD_BCM590XX=n
+CONFIG_MFD_AXP20X_I2C=n
+CONFIG_MFD_DA9063=n
+CONFIG_MFD_MAX14577=n
+CONFIG_MFD_MAX77686=n
+CONFIG_MFD_MAX77693=n
+CONFIG_MFD_MAX8907=n
+CONFIG_MFD_MAX8997=n
+CONFIG_MFD_MAX8998=n
+CONFIG_MFD_PM8XXX=n
+CONFIG_MFD_RK808=n
+CONFIG_MFD_RN5T618=n
+CONFIG_MFD_SEC_CORE=n
+CONFIG_MFD_STMPE=n
+
+# Regulators
+CONFIG_REGULATOR_ACT8865=n
+CONFIG_REGULATOR_DA9210=n
+CONFIG_REGULATOR_FAN53555=n
+CONFIG_REGULATOR_LP872X=n
+CONFIG_REGULATOR_MAX8952=n
+CONFIG_REGULATOR_MAX8973=n
+CONFIG_REGULATOR_PWM=n
+CONFIG_REGULATOR_TPS51632=n
+CONFIG_REGULATOR_TWL4030=n
+
+# RTC drivers
+CONFIG_RTC_DRV_HYM8563=n
+CONFIG_RTC_DRV_RS5C372=n
+CONFIG_RTC_DRV_BQ32K=n
+CONFIG_RTC_DRV_S35390A=n
+CONFIG_RTC_DRV_RX8581=n
+CONFIG_RTC_DRV_EM3027=n
+
+# Watchdog Device Drivers
+CONFIG_XILINX_WATCHDOG=n
+CONFIG_DW_WATCHDOG=n
+
+# GPIO
+CONFIG_GPIO_DWAPB=n
+CONFIG_GPIO_XILINX=n
+CONFIG_GPIO_TPS6586X=n