diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-03-01 13:29:08 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-03-01 13:29:08 -0500 |
| commit | a5e13ea741b6bcbc95c2f8ff6e87bace3e0b4299 (patch) | |
| tree | c6f5ff7dab1f5cdb6bdce3aee41fecf39024ce64 | |
| parent | 5bfd9c8e7bfcba36bfbe24e967bf42de83c7f56c (diff) | |
ARM: omap2plus_defconfig: Update for moved options
Just move the options around to make applying patches against
omap2plus_defconfig easier after making make savedefconfig.
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 202469ffea4d..54e6143424b9 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
| @@ -71,9 +71,10 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y | |||
| 71 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 71 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
| 72 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 72 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y |
| 73 | CONFIG_CPUFREQ_DT=m | 73 | CONFIG_CPUFREQ_DT=m |
| 74 | CONFIG_ARM_TI_CPUFREQ=y | ||
| 75 | # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set | 74 | # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set |
| 75 | CONFIG_ARM_TI_CPUFREQ=y | ||
| 76 | CONFIG_CPU_IDLE=y | 76 | CONFIG_CPU_IDLE=y |
| 77 | CONFIG_KERNEL_MODE_NEON=y | ||
| 77 | CONFIG_BINFMT_MISC=y | 78 | CONFIG_BINFMT_MISC=y |
| 78 | CONFIG_PM_DEBUG=y | 79 | CONFIG_PM_DEBUG=y |
| 79 | CONFIG_NET=y | 80 | CONFIG_NET=y |
| @@ -314,14 +315,14 @@ CONFIG_REGULATOR_TPS65217=y | |||
| 314 | CONFIG_REGULATOR_TPS65218=y | 315 | CONFIG_REGULATOR_TPS65218=y |
| 315 | CONFIG_REGULATOR_TPS65910=y | 316 | CONFIG_REGULATOR_TPS65910=y |
| 316 | CONFIG_REGULATOR_TWL4030=y | 317 | CONFIG_REGULATOR_TWL4030=y |
| 318 | CONFIG_RC_CORE=m | ||
| 319 | CONFIG_RC_DEVICES=y | ||
| 320 | CONFIG_IR_RX51=m | ||
| 317 | CONFIG_MEDIA_SUPPORT=m | 321 | CONFIG_MEDIA_SUPPORT=m |
| 318 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 322 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
| 319 | CONFIG_RC_CORE=m | ||
| 320 | CONFIG_MEDIA_CONTROLLER=y | 323 | CONFIG_MEDIA_CONTROLLER=y |
| 321 | CONFIG_VIDEO_V4L2_SUBDEV_API=y | 324 | CONFIG_VIDEO_V4L2_SUBDEV_API=y |
| 322 | CONFIG_LIRC=m | 325 | CONFIG_LIRC=m |
| 323 | CONFIG_RC_DEVICES=y | ||
| 324 | CONFIG_IR_RX51=m | ||
| 325 | CONFIG_V4L_PLATFORM_DRIVERS=y | 326 | CONFIG_V4L_PLATFORM_DRIVERS=y |
| 326 | CONFIG_VIDEO_OMAP3=m | 327 | CONFIG_VIDEO_OMAP3=m |
| 327 | # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set | 328 | # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set |
| @@ -520,15 +521,6 @@ CONFIG_PROVE_LOCKING=y | |||
| 520 | # CONFIG_DEBUG_BUGVERBOSE is not set | 521 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 521 | CONFIG_SECURITY=y | 522 | CONFIG_SECURITY=y |
| 522 | CONFIG_CRYPTO_MICHAEL_MIC=y | 523 | CONFIG_CRYPTO_MICHAEL_MIC=y |
| 523 | CONFIG_CRC_CCITT=y | ||
| 524 | CONFIG_CRC_T10DIF=y | ||
| 525 | CONFIG_CRC_ITU_T=y | ||
| 526 | CONFIG_CRC7=y | ||
| 527 | CONFIG_LIBCRC32C=y | ||
| 528 | CONFIG_FONTS=y | ||
| 529 | CONFIG_FONT_8x8=y | ||
| 530 | CONFIG_FONT_8x16=y | ||
| 531 | CONFIG_KERNEL_MODE_NEON=y | ||
| 532 | CONFIG_ARM_CRYPTO=y | 524 | CONFIG_ARM_CRYPTO=y |
| 533 | CONFIG_CRYPTO_SHA1_ARM=m | 525 | CONFIG_CRYPTO_SHA1_ARM=m |
| 534 | CONFIG_CRYPTO_SHA1_ARM_NEON=m | 526 | CONFIG_CRYPTO_SHA1_ARM_NEON=m |
| @@ -536,5 +528,13 @@ CONFIG_CRYPTO_SHA256_ARM=m | |||
| 536 | CONFIG_CRYPTO_SHA512_ARM=m | 528 | CONFIG_CRYPTO_SHA512_ARM=m |
| 537 | CONFIG_CRYPTO_AES_ARM=m | 529 | CONFIG_CRYPTO_AES_ARM=m |
| 538 | CONFIG_CRYPTO_AES_ARM_BS=m | 530 | CONFIG_CRYPTO_AES_ARM_BS=m |
| 539 | CONFIG_CRYPTO_CHACHA20_NEON=m | ||
| 540 | CONFIG_CRYPTO_GHASH_ARM_CE=m | 531 | CONFIG_CRYPTO_GHASH_ARM_CE=m |
| 532 | CONFIG_CRYPTO_CHACHA20_NEON=m | ||
| 533 | CONFIG_CRC_CCITT=y | ||
| 534 | CONFIG_CRC_T10DIF=y | ||
| 535 | CONFIG_CRC_ITU_T=y | ||
| 536 | CONFIG_CRC7=y | ||
| 537 | CONFIG_LIBCRC32C=y | ||
| 538 | CONFIG_FONTS=y | ||
| 539 | CONFIG_FONT_8x8=y | ||
| 540 | CONFIG_FONT_8x16=y | ||