kernel: sort generic configs

Use kconfig.pl to sort the generic configs and get rid of duplicate
entries.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

1 files changed, 34 insertions, 35 deletions

diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 5a00e98717..b14bec4e31 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -113,9 +113,9 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_ALX is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_AMD8111_ETH is not set
+# CONFIG_AMD_PHY is not set
 # CONFIG_AMD_XGBE is not set
 # CONFIG_AMD_XGBE_PHY is not set
-# CONFIG_AMD_PHY is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_AMILO_RFKILL is not set
 # CONFIG_ANDROID is not set
@@ -330,8 +330,6 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
-# CONFIG_SWCONFIG_B53 is not set
-# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
@@ -555,11 +553,11 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_L2CAP=y
 # CONFIG_BT_MRVL is not set
 # CONFIG_BT_RFCOMM is not set
-# CONFIG_BUILD_BIN2C is not set
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_SCO=y
 CONFIG_BUG=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
+# CONFIG_BUILD_BIN2C is not set
 # CONFIG_C2PORT is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_CAIF is not set
@@ -734,8 +732,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_DEV_QCE is not set
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 # CONFIG_CRYPTO_DEV_TALITOS is not set
-# CONFIG_CRYPTO_DRBG_MENU is not set
 # CONFIG_CRYPTO_DRBG_CTR is not set
+# CONFIG_CRYPTO_DRBG_MENU is not set
 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_FIPS is not set
@@ -838,8 +836,8 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -937,9 +935,9 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 # CONFIG_DVB_DUMMY_FE is not set
 # CONFIG_DVB_TUNER_DIB0070 is not set
 # CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_WATCHDOG is not set
-# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_E100 is not set
@@ -978,9 +976,6 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_ET131X is not set
-# CONFIG_GATEWORKS_GW16083 is not set
-# CONFIG_GLOB_SELFTEST is not set
-# CONFIG_GS_FPGABOOT is not set
 # CONFIG_ETH16I is not set
 CONFIG_ETHERNET=y
 # CONFIG_ETHOC is not set
@@ -1141,9 +1136,9 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_GACT_PROB=y
 # CONFIG_GADGET_UAC1 is not set
 # CONFIG_GAMEPORT is not set
+# CONFIG_GATEWORKS_GW16083 is not set
 # CONFIG_GCOV is not set
 # CONFIG_GCOV_KERNEL is not set
-# CONFIG_GENEVE is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
@@ -1153,10 +1148,12 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_NET_UTILS=y
 # CONFIG_GENERIC_PHY is not set
 CONFIG_GENERIC_TIME=y
+# CONFIG_GENEVE is not set
 # CONFIG_GENWQE is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_GIGASET_CAPI is not set
 # CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GLOB_SELFTEST is not set
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_GPIOLIB is not set
 # CONFIG_GPIO_74X164 is not set
@@ -1197,6 +1194,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
 # CONFIG_GREENASIA_FF is not set
+# CONFIG_GS_FPGABOOT is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HAPPYMEAL is not set
@@ -1900,17 +1898,17 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_LTE_GDM724X is not set
-# CONFIG_LTR501 is not set
 # CONFIG_LTPC is not set
+# CONFIG_LTR501 is not set
 # CONFIG_LUSTRE_FS is not set
 # CONFIG_LXT_PHY is not set
+# CONFIG_LZ4HC_COMPRESS is not set
+# CONFIG_LZ4_COMPRESS is not set
+# CONFIG_LZ4_DECOMPRESS is not set
 CONFIG_LZMA_COMPRESS=y
 CONFIG_LZMA_DECOMPRESS=y
 # CONFIG_LZO_COMPRESS is not set
 # CONFIG_LZO_DECOMPRESS is not set
-# CONFIG_LZ4_COMPRESS is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_LZ4HC_COMPRESS is not set
 # CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
 # CONFIG_MAC80211 is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
@@ -2266,9 +2264,9 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-# CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
+# CONFIG_MTD_SPI_NOR is not set
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
 # CONFIG_MTD_SPLIT_EVA_FW is not set
@@ -2280,8 +2278,8 @@ CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_SEAMA_FW is not set
 CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
 CONFIG_MTD_SPLIT_SUPPORT=y
-# CONFIG_MTD_SPLIT_TRX_FW is not set
 # CONFIG_MTD_SPLIT_TPLINK_FW is not set
+# CONFIG_MTD_SPLIT_TRX_FW is not set
 # CONFIG_MTD_SPLIT_UIMAGE_FW is not set
 # CONFIG_MTD_SPLIT_WRGG_FW is not set
 # CONFIG_MTD_SST25L is not set
@@ -2292,8 +2290,8 @@ CONFIG_MTD_SPLIT_SUPPORT=y
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_MV643XX_ETH is not set
 # CONFIG_MVMDIO is not set
-# CONFIG_MVSW61XX_PHY is not set
 # CONFIG_MVSW6171_PHY is not set
+# CONFIG_MVSW61XX_PHY is not set
 # CONFIG_MVSWITCH_PHY is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MWIFIEX is not set
@@ -3045,7 +3043,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
 # CONFIG_REISERFS_FS_SECURITY is not set
-# CONFIG_REISERFS_FS_XATTR
+# CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_RELAY is not set
 # CONFIG_RESET_CONTROLLER is not set
@@ -3444,8 +3442,8 @@ CONFIG_SERIAL_8250_DMA=y
 # CONFIG_SERIAL_8250_EM is not set
 # CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_FOURPORT is not set
 # CONFIG_SERIAL_8250_FINTEK is not set
+# CONFIG_SERIAL_8250_FOURPORT is not set
 # CONFIG_SERIAL_8250_HUB6 is not set
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
 CONFIG_SERIAL_8250_NR_UARTS=2
@@ -3794,8 +3792,8 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_MPC52xx is not set
 # CONFIG_SPI_MPC52xx_PSC is not set
-# CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_OCTEON is not set
+# CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_ORION is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PPC4xx is not set
@@ -3811,8 +3809,8 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_XWAY is not set
-# CONFIG_SPMI is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_SPMI is not set
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
@@ -3836,8 +3834,8 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB_SDIOHOST is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
-CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_STACKTRACE is not set
+CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_STAGING=y
 # CONFIG_STAGING_MEDIA is not set
@@ -3846,8 +3844,8 @@ CONFIG_STDBINUTILS=y
 # CONFIG_STE10XP is not set
 # CONFIG_STE_MODEM_RPROC is not set
 # CONFIG_STMMAC_ETH is not set
-# CONFIG_STMMAC_PLATFORM is not set
 # CONFIG_STMMAC_PCI is not set
+# CONFIG_STMMAC_PLATFORM is not set
 CONFIG_STP=y
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_STRIP_ASM_SYMS=y
@@ -3861,6 +3859,8 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUSPEND is not set
 CONFIG_SWAP=y
 # CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_SWCONFIG_LEDS is not set
 # CONFIG_SXGBE_ETH is not set
 # CONFIG_SYNCLINK_CS is not set
@@ -3884,15 +3884,14 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_TASKS_RCU is not set
 # CONFIG_TC35815 is not set
+# CONFIG_TCG_ATMEL is not set
 # CONFIG_TCG_ST33_I2C is not set
-# CONFIG_TCG_TPM is not set
 # CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_ATMEL is not set
-# CONFIG_TCG_ST33_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24 is not set
+# CONFIG_TCG_TPM is not set
 # CONFIG_TCIC is not set
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
@@ -3914,7 +3913,6 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEGRA_HOST1X is not set
 # CONFIG_TEHUTI is not set
 # CONFIG_TEST_BPF is not set
-# CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -3923,6 +3921,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEST_POWER is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_USER_COPY is not set
 CONFIG_TEXTSEARCH=y
 # CONFIG_TEXTSEARCH_BM is not set
@@ -3952,7 +3951,6 @@ CONFIG_TINY_RCU=y
 # CONFIG_TI_DAVINCI_MDIO is not set
 # CONFIG_TI_ST is not set
 # CONFIG_TLAN is not set
-# CONFIG_TWL4030_MADC is not set
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TMP006 is not set
 CONFIG_TMPFS=y
@@ -3971,8 +3969,8 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
@@ -4031,6 +4029,7 @@ CONFIG_TTY=y
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_TUN is not set
 # CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL4030_MADC is not set
 # CONFIG_TWL6030_GPADC is not set
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_TYPHOON is not set
@@ -4051,8 +4050,8 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNIX_DIAG is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_UPROBE_EVENT is not set
 # CONFIG_UPROBES is not set
+# CONFIG_UPROBE_EVENT is not set
 # CONFIG_USB is not set
 # CONFIG_USBIP_CORE is not set
 # CONFIG_USBPCWATCHDOG is not set
@@ -4090,9 +4089,9 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DWC2_PERIPHERAL is not set
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DWC3_EXYNOS is not set
-# CONFIG_USB_DWC3_QCOM is not set
-# CONFIG_USB_DWC3_PCI is not set
 # CONFIG_USB_DWC3_KEYSTONE is not set
+# CONFIG_USB_DWC3_PCI is not set
+# CONFIG_USB_DWC3_QCOM is not set
 # CONFIG_USB_DWC_OTG_LPM is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EG20T is not set
@@ -4646,9 +4645,9 @@ CONFIG_XZ_DEC=y
 # CONFIG_ZLIB_DEFLATE is not set
 # CONFIG_ZLIB_INFLATE is not set
 # CONFIG_ZNET is not set
-# CONFIG_ZPOOL is not set
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZPOOL is not set
 # CONFIG_ZRAM is not set
 # CONFIG_ZRAM_LZ4_COMPRESS is not set
 # CONFIG_ZSMALLOC is not set