Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d7c517b52edf12ffb4aaaeb76633ab00ec5089d0

Authored by Tony Lindgren
1 parent a2fc36613a
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

ARM: omap2plus_defconfig: Shrink with savedefconfig 

This saves few lines and makes it easier to make patches
against omap2plus_defconfig.

Signed-off-by: Tony Lindgren <tony@atomide.com>

Showing 1 changed file with 3 additions and 16 deletions Side-by-side Diff

arch/arm/configs/omap2plus_defconfig
Diff comments   View file @ d7c517b
... ... @@ -32,7 +32,6 @@
32 32 CONFIG_SOC_AM33XX=y
33 33 CONFIG_SOC_AM43XX=y
34 34 CONFIG_SOC_DRA7XX=y
35   -CONFIG_CACHE_L2X0=y
36 35 CONFIG_ARM_THUMBEE=y
37 36 CONFIG_ARM_ERRATA_411920=y
38 37 CONFIG_SMP=y
... ... @@ -44,7 +43,6 @@
44 43 CONFIG_ARM_ATAG_DTB_COMPAT=y
45 44 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
46 45 CONFIG_KEXEC=y
47   -CONFIG_FPE_NWFPE=y
48 46 CONFIG_CPU_IDLE=y
49 47 CONFIG_BINFMT_MISC=y
50 48 CONFIG_PM_DEBUG=y
... ... @@ -75,8 +73,6 @@
75 73 CONFIG_BT_HCIBPA10X=m
76 74 CONFIG_CFG80211=m
77 75 CONFIG_MAC80211=m
78   -CONFIG_MAC80211_RC_PID=y
79   -CONFIG_MAC80211_RC_DEFAULT_PID=y
80 76 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
81 77 CONFIG_DEVTMPFS=y
82 78 CONFIG_DEVTMPFS_MOUNT=y
... ... @@ -103,7 +99,6 @@
103 99 CONFIG_SENSORS_LIS3_I2C=m
104 100 CONFIG_SCSI=y
105 101 CONFIG_BLK_DEV_SD=y
106   -CONFIG_SCSI_MULTI_LUN=y
107 102 CONFIG_SCSI_SCAN_ASYNC=y
108 103 CONFIG_MD=y
109 104 CONFIG_NETDEVICES=y
110 105  
111 106  
... ... @@ -162,15 +157,12 @@
162 157 CONFIG_GPIO_SYSFS=y
163 158 CONFIG_GPIO_TWL4030=y
164 159 CONFIG_W1=y
165   -CONFIG_POWER_SUPPLY=y
166 160 CONFIG_POWER_AVS=y
167 161 CONFIG_SENSORS_LM75=m
168 162 CONFIG_THERMAL=y
169 163 CONFIG_THERMAL_GOV_FAIR_SHARE=y
170 164 CONFIG_THERMAL_GOV_USER_SPACE=y
171   -CONFIG_CPU_THERMAL=y
172 165 CONFIG_TI_SOC_THERMAL=y
173   -CONFIG_TI_THERMAL=y
174 166 CONFIG_OMAP4_THERMAL=y
175 167 CONFIG_OMAP5_THERMAL=y
176 168 CONFIG_DRA752_THERMAL=y
177 169  
... ... @@ -183,8 +175,8 @@
183 175 CONFIG_MFD_TPS65218=y
184 176 CONFIG_MFD_TPS65910=y
185 177 CONFIG_TWL6040_CORE=y
186   -CONFIG_REGULATOR_FIXED_VOLTAGE=y
187 178 CONFIG_REGULATOR_PALMAS=y
  179 +CONFIG_REGULATOR_PBIAS=y
188 180 CONFIG_REGULATOR_TI_ABB=y
189 181 CONFIG_REGULATOR_TPS65023=y
190 182 CONFIG_REGULATOR_TPS6507X=y
... ... @@ -192,7 +184,6 @@
192 184 CONFIG_REGULATOR_TPS65218=y
193 185 CONFIG_REGULATOR_TPS65910=y
194 186 CONFIG_REGULATOR_TWL4030=y
195   -CONFIG_REGULATOR_PBIAS=y
196 187 CONFIG_FB=y
197 188 CONFIG_FIRMWARE_EDID=y
198 189 CONFIG_FB_MODE_HELPERS=y
... ... @@ -221,8 +212,6 @@
221 212 CONFIG_SND_USB_AUDIO=m
222 213 CONFIG_SND_SOC=m
223 214 CONFIG_SND_OMAP_SOC=m
224   -CONFIG_SND_AM33XX_SOC_EVM=m
225   -CONFIG_SND_DAVINCI_SOC=m
226 215 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
227 216 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
228 217 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
... ... @@ -233,9 +222,6 @@
233 222 CONFIG_USB_STORAGE=y
234 223 CONFIG_USB_DWC3=m
235 224 CONFIG_USB_TEST=y
236   -CONFIG_NOP_USB_XCEIV=y
237   -CONFIG_OMAP_USB2=y
238   -CONFIG_TI_PIPE3=y
239 225 CONFIG_AM335X_PHY_USB=y
240 226 CONFIG_USB_GADGET=y
241 227 CONFIG_USB_GADGET_DEBUG=y
... ... @@ -243,7 +229,6 @@
243 229 CONFIG_USB_GADGET_DEBUG_FS=y
244 230 CONFIG_USB_ZERO=m
245 231 CONFIG_MMC=y
246   -CONFIG_MMC_UNSAFE_RESUME=y
247 232 CONFIG_SDIO_UART=y
248 233 CONFIG_MMC_OMAP=y
249 234 CONFIG_MMC_OMAP_HS=y
... ... @@ -267,6 +252,8 @@
267 252 CONFIG_DMA_OMAP=y
268 253 CONFIG_EXTCON=y
269 254 CONFIG_EXTCON_PALMAS=y
  255 +CONFIG_OMAP_USB2=y
  256 +CONFIG_TI_PIPE3=y
270 257 CONFIG_EXT2_FS=y
271 258 CONFIG_EXT3_FS=y
272 259 # CONFIG_EXT3_FS_XATTR is not set