From 096a7d6c4c4a95cab2cbba1f443d8cfc084a6453 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 9 Jan 2018 21:42:40 +0800 Subject: [PATCH] sort kernel configurations --- target/linux/generic/config-4.4 | 8 ++--- target/linux/generic/config-4.9 | 56 +++++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4 index 99cc012e7..a343fa23b 100644 --- a/target/linux/generic/config-4.4 +++ b/target/linux/generic/config-4.4 @@ -82,7 +82,7 @@ CONFIG_32BIT=y # CONFIG_ADM6996_PHY is not set # CONFIG_ADM8211 is not set # CONFIG_ADT7316 is not set -# CONFIG_ADVISE_SYSCALLS is not set +CONFIG_ADVISE_SYSCALLS=y # CONFIG_ADXRS450 is not set CONFIG_AEABI=y # CONFIG_AFFS_FS is not set @@ -1821,6 +1821,7 @@ CONFIG_JOLIET=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_UNCOMPRESSED is not set # CONFIG_KARMA_PARTITION is not set +# CONFIG_KASAN is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_CAT is not set # CONFIG_KERNEL_GZIP is not set @@ -2682,7 +2683,6 @@ CONFIG_NFS_V3=y # CONFIG_NFT_DUP_IPV6 is not set # CONFIG_NF_CONNTRACK is not set # CONFIG_NF_CONNTRACK_AMANDA is not set -# CONFIG_NF_CONNTRACK_CHAIN_EVENTS is not set # CONFIG_NF_CONNTRACK_EVENTS is not set # CONFIG_NF_CONNTRACK_FTP is not set # CONFIG_NF_CONNTRACK_H323 is not set @@ -3651,7 +3651,6 @@ CONFIG_SHMEM=y # CONFIG_SH_ETH is not set # CONFIG_SH_TIMER_CMT is not set # CONFIG_SH_TIMER_MTU2 is not set -# CONFIG_SHORTCUT_FE is not set # CONFIG_SH_TIMER_TMU is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set @@ -4855,4 +4854,5 @@ CONFIG_ZONE_DMA_FLAG=1 # CONFIG_ZPOOL is not set # CONFIG_ZRAM is not set # CONFIG_ZSMALLOC is not set -# CONFIG_NF_CONNTRACK_CHAIN_EVENTS is not set \ No newline at end of file +# CONFIG_NF_CONNTRACK_CHAIN_EVENTS is not set +# CONFIG_SHORTCUT_FE is not set \ No newline at end of file diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9 index 6a703c0a0..15b64d794 100644 --- a/target/linux/generic/config-4.9 +++ b/target/linux/generic/config-4.9 @@ -19,6 +19,7 @@ CONFIG_32BIT=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_EXTLOG is not set # CONFIG_ACPI_HED is not set +# CONFIG_ACPI_NFIT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_TABLE_UPGRADE is not set # CONFIG_ACPI_VIDEO is not set @@ -90,7 +91,7 @@ CONFIG_32BIT=y # CONFIG_ADM6996_PHY is not set # CONFIG_ADM8211 is not set # CONFIG_ADT7316 is not set -# CONFIG_ADVISE_SYSCALLS is not set +CONFIG_ADVISE_SYSCALLS=y # CONFIG_ADXRS450 is not set CONFIG_AEABI=y # CONFIG_AFE4403 is not set @@ -310,6 +311,8 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_ARM_PATCH_PHYS_VIRT is not set # CONFIG_ARM_PSCI is not set # CONFIG_ARM_PTDUMP is not set +# CONFIG_ARM_SBSA_WATCHDOG is not set +# CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_ARM_TIMER_SP804 is not set # CONFIG_ARM_UNWIND is not set # CONFIG_ARM_VIRT_EXT is not set @@ -323,6 +326,7 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_ASYNC_TX_DMA is not set # CONFIG_AT76C50X_USB is not set # CONFIG_AT803X_PHY is not set +# CONFIG_AT91_SAMA5D2_ADC is not set # CONFIG_ATA is not set # CONFIG_ATAGS is not set CONFIG_ATAGS_PROC=y @@ -999,8 +1003,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_WX is not set # CONFIG_DEBUG_ZBOOT is not set # CONFIG_DECNET is not set -CONFIG_DEFAULT_BBR=y -# CONFIG_DEFAULT_CUBIC is not set +CONFIG_DEFAULT_CUBIC=y CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_IOSCHED="deadline" @@ -1009,8 +1012,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_SECURITY="" CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_TCP_CONG="bbr" -# CONFIG_DEFAULT_VEGAS is not set +CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DELL_RBTN is not set # CONFIG_DELL_SMO8800 is not set @@ -1324,6 +1326,7 @@ CONFIG_FRAME_WARN=1024 # CONFIG_FRONTSWAP is not set # CONFIG_FSCACHE is not set # CONFIG_FSL_EDMA is not set +# CONFIG_FSL_MC_BUS is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_XGMAC_MDIO is not set CONFIG_FSNOTIFY=y @@ -1382,14 +1385,19 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_KONA is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CS5535 is not set # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EM is not set +# CONFIG_GPIO_F7188X is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_GPIO_MM is not set # CONFIG_GPIO_GRGPIO is not set # CONFIG_GPIO_ICH is not set +# CONFIG_GPIO_IT87 is not set +# CONFIG_GPIO_LYNXPOINT is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MAX732X is not set @@ -1415,6 +1423,7 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_GPIO_TS5500 is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set +# CONFIG_GPIO_WS16C48 is not set # CONFIG_GPIO_XGENE is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_ZEVIO is not set @@ -1884,6 +1893,7 @@ CONFIG_IO_STRICT_DEVMEM=y # CONFIG_IP6_NF_MATCH_RT is not set # CONFIG_IP6_NF_NAT is not set # CONFIG_IP6_NF_RAW is not set +# CONFIG_IP6_NF_SECURITY is not set # CONFIG_IP6_NF_TARGET_HL is not set # CONFIG_IP6_NF_TARGET_REJECT is not set # CONFIG_IP6_NF_TARGET_SYNPROXY is not set @@ -2037,6 +2047,7 @@ CONFIG_JOLIET=y CONFIG_KALLSYMS_BASE_RELATIVE=y # CONFIG_KALLSYMS_UNCOMPRESSED is not set # CONFIG_KARMA_PARTITION is not set +# CONFIG_KASAN is not set # CONFIG_KCOV is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_CAT is not set @@ -2186,6 +2197,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y # CONFIG_LIBIPW_DEBUG is not set # CONFIG_LIBNVDIMM is not set # CONFIG_LIDAR_LITE_V2 is not set +# CONFIG_LIQUIDIO is not set # CONFIG_LIRC_STAGING is not set # CONFIG_LIS3L02DQ is not set # CONFIG_LKDTM is not set @@ -2629,6 +2641,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y # 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_SPI_NOR_USE_4K_SECTORS_LIMIT=4096 CONFIG_MTD_SPLIT=y # CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set # CONFIG_MTD_SPLIT_EVA_FW is not set @@ -2949,11 +2962,12 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V4 is not set # CONFIG_NFS_V4_1 is not set # CONFIG_NFTL is not set +# CONFIG_NFT_BRIDGE_META is not set +# CONFIG_NFT_BRIDGE_REJECT is not set # CONFIG_NFT_DUP_IPV4 is not set # CONFIG_NFT_DUP_IPV6 is not set # CONFIG_NF_CONNTRACK is not set # CONFIG_NF_CONNTRACK_AMANDA is not set -# CONFIG_NF_CONNTRACK_CHAIN_EVENTS is not set # CONFIG_NF_CONNTRACK_EVENTS is not set # CONFIG_NF_CONNTRACK_FTP is not set # CONFIG_NF_CONNTRACK_H323 is not set @@ -3116,6 +3130,7 @@ CONFIG_PACKET=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set +# CONFIG_PALMAS_GPADC is not set # CONFIG_PANASONIC_LAPTOP is not set # CONFIG_PANEL is not set CONFIG_PANIC_ON_OOPS=y @@ -3207,6 +3222,8 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set # CONFIG_PCI_HERMES is not set # CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set +# CONFIG_PCI_HOST_THUNDER_PEM is not set # CONFIG_PCI_IOV is not set # CONFIG_PCI_LAYERSCAPE is not set # CONFIG_PCI_MSI is not set @@ -3286,6 +3303,7 @@ CONFIG_PINMUX=y # CONFIG_POWERCAP is not set # CONFIG_POWER_AVS is not set # CONFIG_POWER_RESET is not set +# CONFIG_POWER_RESET_BRCMKONA is not set # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_GPIO is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set @@ -3902,6 +3920,7 @@ CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_SENSORS_W83795 is not set # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_XGENE is not set CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_ACCENT is not set # CONFIG_SERIAL_8250_BOCA is not set @@ -3929,6 +3948,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_AMBA_PL010 is not set # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_BCM63XX is not set # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set @@ -3984,7 +4004,6 @@ CONFIG_SHMEM=y # CONFIG_SH_TIMER_CMT is not set # CONFIG_SH_TIMER_MTU2 is not set # CONFIG_SH_TIMER_TMU is not set -# CONFIG_SHORTCUT_FE is not set # CONFIG_SI1145 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set @@ -4068,6 +4087,7 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_DUMMY is not set # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_ECHO3G is not set +# CONFIG_SND_EDMA_SOC is not set # CONFIG_SND_EMU10K1 is not set # CONFIG_SND_EMU10K1X is not set # CONFIG_SND_EMU10K1_SEQ is not set @@ -4272,6 +4292,7 @@ CONFIG_SND_PROC_FS=y # CONFIG_SND_SOC_WM8804_I2C is not set # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM8978 is not set @@ -4339,6 +4360,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set # CONFIG_SPI_CADENCE is not set +# CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set # CONFIG_SPI_FSL_DSPI is not set @@ -4481,7 +4503,7 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TCG_XEN is not set # CONFIG_TCIC is not set CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BBR=y +# CONFIG_TCP_CONG_BBR is not set # CONFIG_TCP_CONG_BIC is not set # CONFIG_TCP_CONG_CDG is not set CONFIG_TCP_CONG_CUBIC=y @@ -4493,10 +4515,10 @@ CONFIG_TCP_CONG_CUBIC=y # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_NV is not set # CONFIG_TCP_CONG_SCALABLE is not set -CONFIG_TCP_CONG_VEGAS=y +# CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_VENO is not set # CONFIG_TCP_CONG_WESTWOOD is not set -CONFIG_TCP_CONG_YEAH=y +# CONFIG_TCP_CONG_YEAH is not set # CONFIG_TCP_MD5SIG is not set # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set @@ -4537,6 +4559,10 @@ CONFIG_TEXTSEARCH=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set # CONFIG_THINKPAD_ACPI is not set # CONFIG_THRUSTMASTER_FF is not set +# CONFIG_THUNDER_NIC_BGX is not set +# CONFIG_THUNDER_NIC_PF is not set +# CONFIG_THUNDER_NIC_RGX is not set +# CONFIG_THUNDER_NIC_VF is not set # CONFIG_THUNDERBOLT is not set # CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_TICK_ONESHOT=y @@ -4589,6 +4615,8 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set +# CONFIG_TOUCHSCREEN_EKTF2127 is not set # CONFIG_TOUCHSCREEN_ELAN is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_FT6236 is not set @@ -4601,15 +4629,20 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_MAX11801 is not set # CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_RM_TS is not set # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_TOUCHSCREEN_S3C2410 is not set +# CONFIG_TOUCHSCREEN_SILEAD is not set +# CONFIG_TOUCHSCREEN_SIS_I2C is not set # CONFIG_TOUCHSCREEN_ST1232 is not set # CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set # CONFIG_TOUCHSCREEN_SX8654 is not set # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set @@ -4729,6 +4762,7 @@ CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_EG20T is not set # CONFIG_USB_EHCI_ATH79 is not set # CONFIG_USB_EHCI_HCD_AT91 is not set +# CONFIG_USB_EHCI_HCD_OMAP is not set # CONFIG_USB_EHCI_HCD_PPC_OF is not set # CONFIG_USB_EHCI_MSM is not set # CONFIG_USB_EHCI_MV is not set @@ -5281,3 +5315,5 @@ CONFIG_ZONE_DMA=y # CONFIG_ZPOOL is not set # CONFIG_ZRAM is not set # CONFIG_ZSMALLOC is not set +# CONFIG_NF_CONNTRACK_CHAIN_EVENTS is not set +# CONFIG_SHORTCUT_FE is not set \ No newline at end of file