Update sunxi-next to 4.12
This commit is contained in:
zador-blood-stained
parent
596d50d37d
commit
645a23bd1c
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.11.2 Kernel Configuration
|
||||
# Linux/arm 4.12.1 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||
@ -109,8 +109,10 @@ CONFIG_TASK_IO_ACCOUNTING=y
|
||||
CONFIG_TREE_RCU=y
|
||||
# CONFIG_RCU_EXPERT is not set
|
||||
CONFIG_SRCU=y
|
||||
CONFIG_TREE_SRCU=y
|
||||
# CONFIG_TASKS_RCU is not set
|
||||
CONFIG_RCU_STALL_COMMON=y
|
||||
CONFIG_RCU_NEED_SEGCBLIST=y
|
||||
# CONFIG_TREE_RCU_TRACE is not set
|
||||
CONFIG_BUILD_BIN2C=y
|
||||
CONFIG_IKCONFIG=y
|
||||
@ -130,7 +132,7 @@ CONFIG_CGROUP_WRITEBACK=y
|
||||
CONFIG_CGROUP_SCHED=y
|
||||
CONFIG_FAIR_GROUP_SCHED=y
|
||||
CONFIG_CFS_BANDWIDTH=y
|
||||
CONFIG_RT_GROUP_SCHED=y
|
||||
# CONFIG_RT_GROUP_SCHED is not set
|
||||
CONFIG_CGROUP_PIDS=y
|
||||
CONFIG_CGROUP_RDMA=y
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
@ -142,7 +144,7 @@ CONFIG_CGROUP_PERF=y
|
||||
CONFIG_CGROUP_BPF=y
|
||||
# CONFIG_CGROUP_DEBUG is not set
|
||||
CONFIG_SOCK_CGROUP_DATA=y
|
||||
# CONFIG_CHECKPOINT_RESTORE is not set
|
||||
CONFIG_CHECKPOINT_RESTORE=y
|
||||
CONFIG_NAMESPACES=y
|
||||
CONFIG_UTS_NS=y
|
||||
CONFIG_IPC_NS=y
|
||||
@ -160,7 +162,6 @@ CONFIG_RD_LZMA=y
|
||||
CONFIG_RD_XZ=y
|
||||
CONFIG_RD_LZO=y
|
||||
CONFIG_RD_LZ4=y
|
||||
CONFIG_INITRAMFS_COMPRESSION=".gz"
|
||||
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
|
||||
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
|
||||
CONFIG_SYSCTL=y
|
||||
@ -301,6 +302,7 @@ CONFIG_BLK_DEV_BSGLIB=y
|
||||
CONFIG_BLK_DEV_INTEGRITY=y
|
||||
# CONFIG_BLK_DEV_ZONED is not set
|
||||
CONFIG_BLK_DEV_THROTTLING=y
|
||||
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
|
||||
# CONFIG_BLK_CMDLINE_PARSER is not set
|
||||
CONFIG_BLK_WBT=y
|
||||
CONFIG_BLK_WBT_SQ=y
|
||||
@ -327,6 +329,9 @@ CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_NOOP is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_MQ_IOSCHED_DEADLINE=y
|
||||
CONFIG_MQ_IOSCHED_KYBER=y
|
||||
CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_PADATA=y
|
||||
CONFIG_ASN1=m
|
||||
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
|
||||
@ -345,7 +350,6 @@ CONFIG_FREEZER=y
|
||||
#
|
||||
CONFIG_MMU=y
|
||||
CONFIG_ARCH_MULTIPLATFORM=y
|
||||
# CONFIG_ARCH_GEMINI is not set
|
||||
# CONFIG_ARCH_EBSA110 is not set
|
||||
# CONFIG_ARCH_EP93XX is not set
|
||||
# CONFIG_ARCH_FOOTBRIDGE is not set
|
||||
@ -499,6 +503,11 @@ CONFIG_MULTI_IRQ_HANDLER=y
|
||||
#
|
||||
# DesignWare PCI Core Support
|
||||
#
|
||||
|
||||
#
|
||||
# PCI Endpoint
|
||||
#
|
||||
# CONFIG_PCI_ENDPOINT is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
|
||||
#
|
||||
@ -633,6 +642,7 @@ CONFIG_CPUFREQ_DT=m
|
||||
CONFIG_CPUFREQ_DT_PLATDEV=y
|
||||
CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
|
||||
CONFIG_ARM_DT_BL_CPUFREQ=m
|
||||
# CONFIG_ARM_DB8500_CPUFREQ is not set
|
||||
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
|
||||
# CONFIG_QORIQ_CPUFREQ is not set
|
||||
|
||||
@ -1205,7 +1215,7 @@ CONFIG_BRIDGE=m
|
||||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA=m
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
@ -1267,6 +1277,13 @@ CONFIG_NET_SCH_FQ=m
|
||||
# CONFIG_NET_SCH_PIE is not set
|
||||
CONFIG_NET_SCH_INGRESS=m
|
||||
# CONFIG_NET_SCH_PLUG is not set
|
||||
CONFIG_NET_SCH_DEFAULT=y
|
||||
# CONFIG_DEFAULT_FQ is not set
|
||||
# CONFIG_DEFAULT_CODEL is not set
|
||||
# CONFIG_DEFAULT_FQ_CODEL is not set
|
||||
# CONFIG_DEFAULT_SFQ is not set
|
||||
CONFIG_DEFAULT_PFIFO_FAST=y
|
||||
CONFIG_DEFAULT_NET_SCH="pfifo_fast"
|
||||
|
||||
#
|
||||
# Classification
|
||||
@ -1380,6 +1397,7 @@ CONFIG_CAN_GW=m
|
||||
# CAN Device Drivers
|
||||
#
|
||||
CONFIG_CAN_VCAN=m
|
||||
CONFIG_CAN_VXCAN=m
|
||||
CONFIG_CAN_SLCAN=m
|
||||
CONFIG_CAN_DEV=m
|
||||
CONFIG_CAN_CALC_BITTIMING=y
|
||||
@ -1400,6 +1418,7 @@ CONFIG_CAN_SUN4I=m
|
||||
#
|
||||
# CAN SPI interfaces
|
||||
#
|
||||
CONFIG_CAN_HI311X=m
|
||||
CONFIG_CAN_MCP251X=m
|
||||
|
||||
#
|
||||
@ -1411,6 +1430,7 @@ CONFIG_CAN_GS_USB=m
|
||||
CONFIG_CAN_KVASER_USB=m
|
||||
CONFIG_CAN_PEAK_USB=m
|
||||
CONFIG_CAN_8DEV_USB=m
|
||||
CONFIG_CAN_MCBA_USB=m
|
||||
# CONFIG_CAN_DEBUG_DEVICES is not set
|
||||
CONFIG_IRDA=m
|
||||
|
||||
@ -1478,7 +1498,9 @@ CONFIG_BT_HCIBTUSB_BCM=y
|
||||
CONFIG_BT_HCIBTUSB_RTL=y
|
||||
CONFIG_BT_HCIBTSDIO=m
|
||||
CONFIG_BT_HCIUART=m
|
||||
CONFIG_BT_HCIUART_SERDEV=y
|
||||
CONFIG_BT_HCIUART_H4=y
|
||||
# CONFIG_BT_HCIUART_NOKIA is not set
|
||||
CONFIG_BT_HCIUART_BCSP=y
|
||||
CONFIG_BT_HCIUART_ATH3K=y
|
||||
CONFIG_BT_HCIUART_LL=y
|
||||
@ -1580,6 +1602,7 @@ CONFIG_DEV_COREDUMP=y
|
||||
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
@ -1692,7 +1715,6 @@ CONFIG_MTD_NAND=y
|
||||
# CONFIG_MTD_NAND_DENALI_DT is not set
|
||||
CONFIG_MTD_NAND_GPIO=y
|
||||
# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
|
||||
CONFIG_MTD_NAND_IDS=y
|
||||
# CONFIG_MTD_NAND_DISKONCHIP is not set
|
||||
# CONFIG_MTD_NAND_DOCG4 is not set
|
||||
# CONFIG_MTD_NAND_NANDSIM is not set
|
||||
@ -1754,7 +1776,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4
|
||||
CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
# CONFIG_CDROM_PKTCDVD is not set
|
||||
# CONFIG_ATA_OVER_ETH is not set
|
||||
# CONFIG_MG_DISK is not set
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_NVME_CORE=m
|
||||
# CONFIG_BLK_DEV_NVME_SCSI is not set
|
||||
@ -1784,7 +1805,6 @@ CONFIG_NVME_TARGET_LOOP=m
|
||||
# CONFIG_USB_SWITCH_FSA9480 is not set
|
||||
# CONFIG_LATTICE_ECP3_CONFIG is not set
|
||||
# CONFIG_SRAM is not set
|
||||
# CONFIG_PANEL is not set
|
||||
# CONFIG_C2PORT is not set
|
||||
|
||||
#
|
||||
@ -1950,7 +1970,6 @@ CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_THIN_PROVISIONING=m
|
||||
CONFIG_DM_CACHE=m
|
||||
CONFIG_DM_CACHE_SMQ=m
|
||||
CONFIG_DM_CACHE_CLEANER=m
|
||||
# CONFIG_DM_ERA is not set
|
||||
# CONFIG_DM_MIRROR is not set
|
||||
CONFIG_DM_RAID=m
|
||||
@ -1965,6 +1984,7 @@ CONFIG_DM_VERITY=m
|
||||
# CONFIG_DM_VERITY_FEC is not set
|
||||
CONFIG_DM_SWITCH=m
|
||||
CONFIG_DM_LOG_WRITES=m
|
||||
CONFIG_DM_INTEGRITY=m
|
||||
CONFIG_TARGET_CORE=m
|
||||
CONFIG_TCM_IBLOCK=m
|
||||
CONFIG_TCM_FILEIO=m
|
||||
@ -2016,6 +2036,10 @@ CONFIG_B53_MMAP_DRIVER=m
|
||||
CONFIG_B53_SRAB_DRIVER=m
|
||||
# CONFIG_NET_DSA_MV88E6XXX is not set
|
||||
# CONFIG_NET_DSA_QCA8K is not set
|
||||
# CONFIG_NET_DSA_LOOP is not set
|
||||
# CONFIG_NET_DSA_MT7530 is not set
|
||||
# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
|
||||
# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
|
||||
CONFIG_ETHERNET=y
|
||||
# CONFIG_NET_VENDOR_ALACRITECH is not set
|
||||
CONFIG_NET_VENDOR_ALLWINNER=y
|
||||
@ -2058,19 +2082,18 @@ CONFIG_DWMAC_GENERIC=y
|
||||
CONFIG_DWMAC_SUNXI=y
|
||||
# CONFIG_NET_VENDOR_VIA is not set
|
||||
# CONFIG_NET_VENDOR_WIZNET is not set
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_SWPHY=y
|
||||
CONFIG_LED_TRIGGER_PHY=y
|
||||
|
||||
#
|
||||
# MDIO bus device drivers
|
||||
#
|
||||
CONFIG_NET_VENDOR_SYNOPSYS=y
|
||||
# CONFIG_DWC_XLGMAC is not set
|
||||
CONFIG_MDIO_DEVICE=y
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MDIO_BUS_MUX_GPIO is not set
|
||||
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
|
||||
# CONFIG_MDIO_HISI_FEMAC is not set
|
||||
CONFIG_MDIO_SUN4I=y
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_SWPHY=y
|
||||
CONFIG_LED_TRIGGER_PHY=y
|
||||
|
||||
#
|
||||
# MII PHY device drivers
|
||||
@ -2344,6 +2367,7 @@ CONFIG_MOUSE_PS2=m
|
||||
# CONFIG_MOUSE_PS2_BYD is not set
|
||||
CONFIG_MOUSE_PS2_LOGIPS2PP=y
|
||||
# CONFIG_MOUSE_PS2_SYNAPTICS is not set
|
||||
# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set
|
||||
# CONFIG_MOUSE_PS2_CYPRESS is not set
|
||||
# CONFIG_MOUSE_PS2_TRACKPOINT is not set
|
||||
# CONFIG_MOUSE_PS2_ELANTECH is not set
|
||||
@ -2542,6 +2566,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
|
||||
# CONFIG_SERIAL_MAX3100 is not set
|
||||
# CONFIG_SERIAL_MAX310X is not set
|
||||
CONFIG_SERIAL_UARTLITE=m
|
||||
CONFIG_SERIAL_UARTLITE_NR_UARTS=1
|
||||
CONFIG_SERIAL_CORE=y
|
||||
CONFIG_SERIAL_CORE_CONSOLE=y
|
||||
# CONFIG_SERIAL_SCCNXP is not set
|
||||
@ -2583,6 +2608,7 @@ CONFIG_I2C_MUX=y
|
||||
#
|
||||
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
|
||||
CONFIG_I2C_MUX_GPIO=m
|
||||
CONFIG_I2C_MUX_LTC4306=m
|
||||
CONFIG_I2C_MUX_PCA9541=m
|
||||
CONFIG_I2C_MUX_PCA954x=m
|
||||
CONFIG_I2C_MUX_PINCTRL=m
|
||||
@ -2716,6 +2742,9 @@ CONFIG_PINCTRL_SUN8I_H3_R=y
|
||||
CONFIG_PINCTRL_SUN8I_V3S=y
|
||||
CONFIG_PINCTRL_SUN9I_A80=y
|
||||
CONFIG_PINCTRL_SUN9I_A80_R=y
|
||||
# CONFIG_PINCTRL_SUN50I_A64 is not set
|
||||
# CONFIG_PINCTRL_SUN50I_A64_R is not set
|
||||
# CONFIG_PINCTRL_SUN50I_H5 is not set
|
||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_OF_GPIO=y
|
||||
@ -2730,6 +2759,7 @@ CONFIG_GPIO_SYSFS=y
|
||||
CONFIG_GPIO_ALTERA=m
|
||||
CONFIG_GPIO_AXP209=y
|
||||
# CONFIG_GPIO_DWAPB is not set
|
||||
# CONFIG_GPIO_FTGPIO010 is not set
|
||||
# CONFIG_GPIO_GENERIC_PLATFORM is not set
|
||||
# CONFIG_GPIO_GRGPIO is not set
|
||||
# CONFIG_GPIO_MOCKUP is not set
|
||||
@ -2795,6 +2825,7 @@ CONFIG_W1_SLAVE_DS2423=m
|
||||
CONFIG_W1_SLAVE_DS2431=m
|
||||
CONFIG_W1_SLAVE_DS2433=m
|
||||
# CONFIG_W1_SLAVE_DS2433_CRC is not set
|
||||
CONFIG_W1_SLAVE_DS2438=m
|
||||
# CONFIG_W1_SLAVE_DS2760 is not set
|
||||
# CONFIG_W1_SLAVE_DS2780 is not set
|
||||
# CONFIG_W1_SLAVE_DS2781 is not set
|
||||
@ -2821,9 +2852,13 @@ CONFIG_POWER_SUPPLY=y
|
||||
# CONFIG_BATTERY_DS2780 is not set
|
||||
# CONFIG_BATTERY_DS2781 is not set
|
||||
# CONFIG_BATTERY_DS2782 is not set
|
||||
# CONFIG_BATTERY_LEGO_EV3 is not set
|
||||
# CONFIG_BATTERY_SBS is not set
|
||||
# CONFIG_CHARGER_SBS is not set
|
||||
# CONFIG_BATTERY_BQ27XXX is not set
|
||||
CONFIG_CHARGER_AXP20X=y
|
||||
CONFIG_BATTERY_AXP20X=y
|
||||
CONFIG_AXP20X_POWER=y
|
||||
CONFIG_AXP288_CHARGER=m
|
||||
CONFIG_AXP288_FUEL_GAUGE=m
|
||||
# CONFIG_BATTERY_MAX17040 is not set
|
||||
@ -2842,7 +2877,6 @@ CONFIG_AXP288_FUEL_GAUGE=m
|
||||
# CONFIG_CHARGER_SMB347 is not set
|
||||
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
||||
# CONFIG_CHARGER_RT9455 is not set
|
||||
CONFIG_AXP20X_POWER=y
|
||||
CONFIG_HWMON=y
|
||||
CONFIG_HWMON_VID=m
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
@ -2867,6 +2901,7 @@ CONFIG_SENSORS_ADT7462=m
|
||||
CONFIG_SENSORS_ADT7470=m
|
||||
CONFIG_SENSORS_ADT7475=m
|
||||
CONFIG_SENSORS_ASC7621=m
|
||||
# CONFIG_SENSORS_ASPEED is not set
|
||||
CONFIG_SENSORS_ATXP1=m
|
||||
CONFIG_SENSORS_DS620=m
|
||||
CONFIG_SENSORS_DS1621=m
|
||||
@ -2976,6 +3011,7 @@ CONFIG_SENSORS_W83L786NG=m
|
||||
CONFIG_SENSORS_W83627HF=m
|
||||
CONFIG_SENSORS_W83627EHF=m
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||
CONFIG_THERMAL_HWMON=y
|
||||
CONFIG_THERMAL_OF=y
|
||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||
@ -3123,6 +3159,7 @@ CONFIG_MFD_SYSCON=y
|
||||
# CONFIG_MFD_TI_AM335X_TSCADC is not set
|
||||
# CONFIG_MFD_LP3943 is not set
|
||||
# CONFIG_MFD_LP8788 is not set
|
||||
# CONFIG_MFD_TI_LMU is not set
|
||||
# CONFIG_MFD_PALMAS is not set
|
||||
# CONFIG_TPS6105X is not set
|
||||
# CONFIG_TPS65010 is not set
|
||||
@ -3189,7 +3226,10 @@ CONFIG_REGULATOR_PWM=m
|
||||
# CONFIG_REGULATOR_TPS62360 is not set
|
||||
# CONFIG_REGULATOR_TPS65023 is not set
|
||||
# CONFIG_REGULATOR_TPS6507X is not set
|
||||
# CONFIG_REGULATOR_TPS65132 is not set
|
||||
# CONFIG_REGULATOR_TPS6524X is not set
|
||||
CONFIG_REGULATOR_VCTRL=m
|
||||
CONFIG_CEC_CORE=m
|
||||
CONFIG_MEDIA_SUPPORT=y
|
||||
|
||||
#
|
||||
@ -3202,7 +3242,7 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
|
||||
CONFIG_MEDIA_SDR_SUPPORT=y
|
||||
CONFIG_MEDIA_RC_SUPPORT=y
|
||||
# CONFIG_MEDIA_CEC_SUPPORT is not set
|
||||
CONFIG_MEDIA_CEC_EDID=y
|
||||
CONFIG_MEDIA_CEC_RC=y
|
||||
CONFIG_MEDIA_CONTROLLER=y
|
||||
# CONFIG_MEDIA_CONTROLLER_DVB is not set
|
||||
CONFIG_VIDEO_DEV=y
|
||||
@ -3258,6 +3298,7 @@ CONFIG_RC_DEVICES=y
|
||||
CONFIG_IR_SUNXI=m
|
||||
CONFIG_IR_SERIAL=m
|
||||
CONFIG_IR_SERIAL_TRANSMITTER=y
|
||||
CONFIG_IR_SIR=m
|
||||
CONFIG_MEDIA_USB_SUPPORT=y
|
||||
|
||||
#
|
||||
@ -3502,7 +3543,9 @@ CONFIG_VIDEO_SAA6588=m
|
||||
CONFIG_VIDEO_ADV7180=m
|
||||
CONFIG_VIDEO_ADV7183=m
|
||||
CONFIG_VIDEO_ADV7604=m
|
||||
CONFIG_VIDEO_ADV7604_CEC=y
|
||||
CONFIG_VIDEO_ADV7842=m
|
||||
CONFIG_VIDEO_ADV7842_CEC=y
|
||||
CONFIG_VIDEO_BT819=m
|
||||
CONFIG_VIDEO_BT856=m
|
||||
CONFIG_VIDEO_BT866=m
|
||||
@ -3536,6 +3579,7 @@ CONFIG_VIDEO_ADV7175=m
|
||||
CONFIG_VIDEO_ADV7343=m
|
||||
CONFIG_VIDEO_ADV7393=m
|
||||
CONFIG_VIDEO_ADV7511=m
|
||||
CONFIG_VIDEO_ADV7511_CEC=y
|
||||
CONFIG_VIDEO_AD9389B=m
|
||||
CONFIG_VIDEO_AK881X=m
|
||||
CONFIG_VIDEO_THS8200=m
|
||||
@ -3543,7 +3587,10 @@ CONFIG_VIDEO_THS8200=m
|
||||
#
|
||||
# Camera sensor devices
|
||||
#
|
||||
# CONFIG_VIDEO_OV2640 is not set
|
||||
# CONFIG_VIDEO_OV2659 is not set
|
||||
# CONFIG_VIDEO_OV5645 is not set
|
||||
# CONFIG_VIDEO_OV5647 is not set
|
||||
# CONFIG_VIDEO_OV7640 is not set
|
||||
# CONFIG_VIDEO_OV7670 is not set
|
||||
# CONFIG_VIDEO_OV9650 is not set
|
||||
@ -3875,6 +3922,7 @@ CONFIG_BACKLIGHT_GENERIC=m
|
||||
# CONFIG_BACKLIGHT_GPIO is not set
|
||||
# CONFIG_BACKLIGHT_LV5207LP is not set
|
||||
# CONFIG_BACKLIGHT_BD6107 is not set
|
||||
# CONFIG_BACKLIGHT_ARCXCNN is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
CONFIG_HDMI=y
|
||||
|
||||
@ -3906,7 +3954,7 @@ CONFIG_SND_JACK_INPUT_DEV=y
|
||||
CONFIG_SND_PCM_TIMER=y
|
||||
# CONFIG_SND_HRTIMER is not set
|
||||
# CONFIG_SND_DYNAMIC_MINORS is not set
|
||||
CONFIG_SND_SUPPORT_OLD_API=y
|
||||
# CONFIG_SND_SUPPORT_OLD_API is not set
|
||||
CONFIG_SND_PROC_FS=y
|
||||
CONFIG_SND_VERBOSE_PROCFS=y
|
||||
# CONFIG_SND_VERBOSE_PRINTK is not set
|
||||
@ -3964,6 +4012,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
|
||||
# CONFIG_SND_SOC_FSL_SPDIF is not set
|
||||
# CONFIG_SND_SOC_FSL_ESAI is not set
|
||||
# CONFIG_SND_SOC_IMX_AUDMUX is not set
|
||||
# CONFIG_SND_I2S_HI6210_I2S is not set
|
||||
# CONFIG_SND_SOC_IMG is not set
|
||||
|
||||
#
|
||||
@ -3975,99 +4024,123 @@ CONFIG_SND_SUN8I_CODEC_ANALOG=m
|
||||
CONFIG_SND_SUN4I_I2S=m
|
||||
CONFIG_SND_SUN4I_SPDIF=m
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
# CONFIG_ZX_TDM is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
|
||||
#
|
||||
# CODEC drivers
|
||||
#
|
||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
# CONFIG_SND_SOC_ADAU7002 is not set
|
||||
CONFIG_SND_SOC_ADAU_UTILS=m
|
||||
CONFIG_SND_SOC_ADAU1701=m
|
||||
CONFIG_SND_SOC_ADAU17X1=m
|
||||
CONFIG_SND_SOC_ADAU1761=m
|
||||
CONFIG_SND_SOC_ADAU1761_I2C=m
|
||||
CONFIG_SND_SOC_ADAU1761_SPI=m
|
||||
CONFIG_SND_SOC_ADAU7002=m
|
||||
# CONFIG_SND_SOC_AK4104 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
# CONFIG_SND_SOC_ALC5623 is not set
|
||||
# CONFIG_SND_SOC_BT_SCO is not set
|
||||
# CONFIG_SND_SOC_CS35L32 is not set
|
||||
# CONFIG_SND_SOC_CS35L33 is not set
|
||||
# CONFIG_SND_SOC_CS35L34 is not set
|
||||
# CONFIG_SND_SOC_CS42L42 is not set
|
||||
# CONFIG_SND_SOC_CS42L51_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
# CONFIG_SND_SOC_CS42L73 is not set
|
||||
# CONFIG_SND_SOC_CS4265 is not set
|
||||
# CONFIG_SND_SOC_CS4270 is not set
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_ES8328_I2C is not set
|
||||
# CONFIG_SND_SOC_ES8328_SPI is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
CONFIG_SND_SOC_BT_SCO=m
|
||||
CONFIG_SND_SOC_CS35L32=m
|
||||
CONFIG_SND_SOC_CS35L33=m
|
||||
CONFIG_SND_SOC_CS35L34=m
|
||||
CONFIG_SND_SOC_CS35L35=m
|
||||
CONFIG_SND_SOC_CS42L42=m
|
||||
CONFIG_SND_SOC_CS42L51=m
|
||||
CONFIG_SND_SOC_CS42L51_I2C=m
|
||||
CONFIG_SND_SOC_CS42L52=m
|
||||
CONFIG_SND_SOC_CS42L56=m
|
||||
CONFIG_SND_SOC_CS42L73=m
|
||||
CONFIG_SND_SOC_CS4265=m
|
||||
CONFIG_SND_SOC_CS4270=m
|
||||
CONFIG_SND_SOC_CS4271=m
|
||||
CONFIG_SND_SOC_CS4271_I2C=m
|
||||
CONFIG_SND_SOC_CS4271_SPI=m
|
||||
CONFIG_SND_SOC_CS42XX8=m
|
||||
CONFIG_SND_SOC_CS42XX8_I2C=m
|
||||
CONFIG_SND_SOC_CS4349=m
|
||||
CONFIG_SND_SOC_CS53L30=m
|
||||
CONFIG_SND_SOC_DIO2125=m
|
||||
CONFIG_SND_SOC_ES7134=m
|
||||
CONFIG_SND_SOC_ES8328=m
|
||||
CONFIG_SND_SOC_ES8328_I2C=m
|
||||
CONFIG_SND_SOC_ES8328_SPI=m
|
||||
CONFIG_SND_SOC_GTM601=m
|
||||
CONFIG_SND_SOC_INNO_RK3036=m
|
||||
CONFIG_SND_SOC_MAX98504=m
|
||||
CONFIG_SND_SOC_MAX98927=m
|
||||
CONFIG_SND_SOC_MAX9860=m
|
||||
# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
# CONFIG_SND_SOC_PCM179X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM179X_SPI is not set
|
||||
# CONFIG_SND_SOC_PCM3168A_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM3168A_SPI is not set
|
||||
# CONFIG_SND_SOC_PCM512x_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM512x_SPI is not set
|
||||
# CONFIG_SND_SOC_RT5616 is not set
|
||||
# CONFIG_SND_SOC_RT5631 is not set
|
||||
CONFIG_SND_SOC_PCM1681=m
|
||||
CONFIG_SND_SOC_PCM179X=m
|
||||
CONFIG_SND_SOC_PCM179X_I2C=m
|
||||
CONFIG_SND_SOC_PCM179X_SPI=m
|
||||
CONFIG_SND_SOC_PCM3168A=m
|
||||
CONFIG_SND_SOC_PCM3168A_I2C=m
|
||||
CONFIG_SND_SOC_PCM3168A_SPI=m
|
||||
CONFIG_SND_SOC_PCM512x=m
|
||||
CONFIG_SND_SOC_PCM512x_I2C=m
|
||||
CONFIG_SND_SOC_PCM512x_SPI=m
|
||||
CONFIG_SND_SOC_RL6231=m
|
||||
CONFIG_SND_SOC_RT5616=m
|
||||
CONFIG_SND_SOC_RT5631=m
|
||||
# CONFIG_SND_SOC_RT5677_SPI is not set
|
||||
# CONFIG_SND_SOC_SGTL5000 is not set
|
||||
CONFIG_SND_SOC_SGTL5000=m
|
||||
CONFIG_SND_SOC_SIGMADSP=m
|
||||
CONFIG_SND_SOC_SIGMADSP_I2C=m
|
||||
CONFIG_SND_SOC_SIGMADSP_REGMAP=m
|
||||
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
||||
CONFIG_SND_SOC_SPDIF=m
|
||||
# CONFIG_SND_SOC_SSM2602_SPI is not set
|
||||
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
||||
# CONFIG_SND_SOC_SSM4567 is not set
|
||||
# CONFIG_SND_SOC_STA32X is not set
|
||||
# CONFIG_SND_SOC_STA350 is not set
|
||||
CONFIG_SND_SOC_SSM2602=m
|
||||
CONFIG_SND_SOC_SSM2602_SPI=m
|
||||
CONFIG_SND_SOC_SSM2602_I2C=m
|
||||
CONFIG_SND_SOC_SSM4567=m
|
||||
CONFIG_SND_SOC_STA32X=m
|
||||
CONFIG_SND_SOC_STA350=m
|
||||
# CONFIG_SND_SOC_STI_SAS is not set
|
||||
# CONFIG_SND_SOC_TAS2552 is not set
|
||||
# CONFIG_SND_SOC_TAS5086 is not set
|
||||
# CONFIG_SND_SOC_TAS571X is not set
|
||||
# CONFIG_SND_SOC_TAS5720 is not set
|
||||
# CONFIG_SND_SOC_TFA9879 is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC31XX is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC3X is not set
|
||||
# CONFIG_SND_SOC_TS3A227E is not set
|
||||
# CONFIG_SND_SOC_WM8510 is not set
|
||||
# CONFIG_SND_SOC_WM8523 is not set
|
||||
# CONFIG_SND_SOC_WM8580 is not set
|
||||
# CONFIG_SND_SOC_WM8711 is not set
|
||||
# CONFIG_SND_SOC_WM8728 is not set
|
||||
# CONFIG_SND_SOC_WM8731 is not set
|
||||
# CONFIG_SND_SOC_WM8737 is not set
|
||||
# CONFIG_SND_SOC_WM8741 is not set
|
||||
# CONFIG_SND_SOC_WM8750 is not set
|
||||
# CONFIG_SND_SOC_WM8753 is not set
|
||||
# CONFIG_SND_SOC_WM8770 is not set
|
||||
# CONFIG_SND_SOC_WM8776 is not set
|
||||
# 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
|
||||
# CONFIG_SND_SOC_WM8985 is not set
|
||||
# CONFIG_SND_SOC_NAU8540 is not set
|
||||
# CONFIG_SND_SOC_NAU8810 is not set
|
||||
# CONFIG_SND_SOC_TPA6130A2 is not set
|
||||
CONFIG_SND_SOC_TAS2552=m
|
||||
CONFIG_SND_SOC_TAS5086=m
|
||||
CONFIG_SND_SOC_TAS571X=m
|
||||
CONFIG_SND_SOC_TAS5720=m
|
||||
CONFIG_SND_SOC_TFA9879=m
|
||||
CONFIG_SND_SOC_TLV320AIC23=m
|
||||
CONFIG_SND_SOC_TLV320AIC23_I2C=m
|
||||
CONFIG_SND_SOC_TLV320AIC23_SPI=m
|
||||
CONFIG_SND_SOC_TLV320AIC31XX=m
|
||||
CONFIG_SND_SOC_TLV320AIC3X=m
|
||||
CONFIG_SND_SOC_TS3A227E=m
|
||||
CONFIG_SND_SOC_WM8510=m
|
||||
CONFIG_SND_SOC_WM8523=m
|
||||
CONFIG_SND_SOC_WM8580=m
|
||||
CONFIG_SND_SOC_WM8711=m
|
||||
CONFIG_SND_SOC_WM8728=m
|
||||
CONFIG_SND_SOC_WM8731=m
|
||||
CONFIG_SND_SOC_WM8737=m
|
||||
CONFIG_SND_SOC_WM8741=m
|
||||
CONFIG_SND_SOC_WM8750=m
|
||||
CONFIG_SND_SOC_WM8753=m
|
||||
CONFIG_SND_SOC_WM8770=m
|
||||
CONFIG_SND_SOC_WM8776=m
|
||||
CONFIG_SND_SOC_WM8804=m
|
||||
CONFIG_SND_SOC_WM8804_I2C=m
|
||||
CONFIG_SND_SOC_WM8804_SPI=m
|
||||
CONFIG_SND_SOC_WM8903=m
|
||||
CONFIG_SND_SOC_WM8960=m
|
||||
CONFIG_SND_SOC_WM8962=m
|
||||
CONFIG_SND_SOC_WM8974=m
|
||||
CONFIG_SND_SOC_WM8978=m
|
||||
CONFIG_SND_SOC_WM8985=m
|
||||
CONFIG_SND_SOC_NAU8540=m
|
||||
CONFIG_SND_SOC_NAU8810=m
|
||||
CONFIG_SND_SOC_NAU8824=m
|
||||
CONFIG_SND_SOC_TPA6130A2=m
|
||||
CONFIG_SND_SIMPLE_CARD_UTILS=m
|
||||
CONFIG_SND_SIMPLE_CARD=m
|
||||
# CONFIG_SND_SIMPLE_SCU_CARD is not set
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
|
||||
#
|
||||
# HID support
|
||||
@ -4082,6 +4155,7 @@ CONFIG_HID_GENERIC=y
|
||||
# Special HID drivers
|
||||
#
|
||||
CONFIG_HID_A4TECH=m
|
||||
# CONFIG_HID_ACCUTOUCH is not set
|
||||
CONFIG_HID_ACRUX=m
|
||||
CONFIG_HID_ACRUX_FF=y
|
||||
CONFIG_HID_APPLE=m
|
||||
@ -4131,6 +4205,7 @@ CONFIG_HID_MAGICMOUSE=m
|
||||
CONFIG_HID_MICROSOFT=m
|
||||
CONFIG_HID_MONTEREY=m
|
||||
CONFIG_HID_MULTITOUCH=m
|
||||
# CONFIG_HID_NTI is not set
|
||||
CONFIG_HID_NTRIG=m
|
||||
CONFIG_HID_ORTEK=m
|
||||
CONFIG_HID_PANTHERLORD=m
|
||||
@ -4466,6 +4541,10 @@ CONFIG_USB_G_MULTI_RNDIS=y
|
||||
CONFIG_USB_G_HID=m
|
||||
# CONFIG_USB_G_DBGP is not set
|
||||
CONFIG_USB_G_WEBCAM=m
|
||||
|
||||
#
|
||||
# USB Power Delivery and Type-C drivers
|
||||
#
|
||||
# CONFIG_USB_LED_TRIG is not set
|
||||
CONFIG_USB_ULPI_BUS=m
|
||||
# CONFIG_UWB is not set
|
||||
@ -4508,6 +4587,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
|
||||
# CONFIG_LEDS_PCA9532 is not set
|
||||
CONFIG_LEDS_GPIO=y
|
||||
# CONFIG_LEDS_LP3944 is not set
|
||||
# CONFIG_LEDS_LP3952 is not set
|
||||
# CONFIG_LEDS_LP5521 is not set
|
||||
# CONFIG_LEDS_LP5523 is not set
|
||||
# CONFIG_LEDS_LP5562 is not set
|
||||
@ -4557,7 +4637,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
# CONFIG_EDAC is not set
|
||||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
# CONFIG_RTC_HCTOSYS is not set
|
||||
@ -4694,6 +4773,7 @@ CONFIG_ASYNC_TX_DMA=y
|
||||
#
|
||||
# CONFIG_SYNC_FILE is not set
|
||||
# CONFIG_AUXDISPLAY is not set
|
||||
# CONFIG_PANEL is not set
|
||||
CONFIG_UIO=m
|
||||
CONFIG_UIO_PDRV_GENIRQ=m
|
||||
CONFIG_UIO_DMEM_GENIRQ=m
|
||||
@ -4709,10 +4789,12 @@ CONFIG_UIO_DMEM_GENIRQ=m
|
||||
#
|
||||
# Microsoft Hyper-V guest support
|
||||
#
|
||||
# CONFIG_HYPERV_TSCPAGE is not set
|
||||
CONFIG_STAGING=y
|
||||
# CONFIG_PRISM2_USB is not set
|
||||
# CONFIG_COMEDI is not set
|
||||
# CONFIG_RTLLIB is not set
|
||||
CONFIG_RTL8723BS=m
|
||||
CONFIG_R8712U=m
|
||||
CONFIG_R8188EU=m
|
||||
CONFIG_88EU_AP_MODE=y
|
||||
@ -4800,8 +4882,6 @@ CONFIG_AD9834=m
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
CONFIG_I2C_BCM2048=m
|
||||
CONFIG_LIRC_STAGING=y
|
||||
# CONFIG_LIRC_SASEM is not set
|
||||
# CONFIG_LIRC_SIR is not set
|
||||
# CONFIG_LIRC_ZILOG is not set
|
||||
|
||||
#
|
||||
@ -4831,6 +4911,7 @@ CONFIG_FB_TFT_PCD8544=m
|
||||
CONFIG_FB_TFT_RA8875=m
|
||||
CONFIG_FB_TFT_S6D02A1=m
|
||||
CONFIG_FB_TFT_S6D1121=m
|
||||
CONFIG_FB_TFT_SH1106=m
|
||||
CONFIG_FB_TFT_SSD1289=m
|
||||
CONFIG_FB_TFT_SSD1305=m
|
||||
CONFIG_FB_TFT_SSD1306=m
|
||||
@ -4860,6 +4941,12 @@ CONFIG_HDM_I2C=m
|
||||
CONFIG_HDM_USB=m
|
||||
# CONFIG_KS7010 is not set
|
||||
# CONFIG_GREYBUS is not set
|
||||
# CONFIG_CRYPTO_DEV_CCREE is not set
|
||||
|
||||
#
|
||||
# USB Power Delivery and Type-C drivers
|
||||
#
|
||||
# CONFIG_TYPEC_TCPM is not set
|
||||
# CONFIG_GOLDFISH is not set
|
||||
# CONFIG_CHROME_PLATFORMS is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
@ -4893,7 +4980,6 @@ CONFIG_SUNXI_CCU_NKM=y
|
||||
CONFIG_SUNXI_CCU_NKMP=y
|
||||
CONFIG_SUNXI_CCU_NM=y
|
||||
CONFIG_SUNXI_CCU_MP=y
|
||||
CONFIG_SUN50I_A64_CCU=y
|
||||
CONFIG_SUN5I_CCU=y
|
||||
CONFIG_SUN6I_A31_CCU=y
|
||||
CONFIG_SUN8I_A23_CCU=y
|
||||
@ -4901,6 +4987,7 @@ CONFIG_SUN8I_A33_CCU=y
|
||||
CONFIG_SUN8I_H3_CCU=y
|
||||
CONFIG_SUN8I_V3S_CCU=y
|
||||
CONFIG_SUN9I_A80_CCU=y
|
||||
CONFIG_SUN8I_R_CCU=y
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
@ -4954,6 +5041,10 @@ CONFIG_ARM_SMMU=y
|
||||
# Broadcom SoC drivers
|
||||
#
|
||||
# CONFIG_SOC_BRCMSTB is not set
|
||||
|
||||
#
|
||||
# i.MX SoC drivers
|
||||
#
|
||||
CONFIG_SUNXI_SRAM=y
|
||||
# CONFIG_SOC_TI is not set
|
||||
# CONFIG_SOC_ZTE is not set
|
||||
@ -4999,6 +5090,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
|
||||
#
|
||||
# Accelerometers
|
||||
#
|
||||
# CONFIG_ADXL345_I2C is not set
|
||||
# CONFIG_ADXL345_SPI is not set
|
||||
# CONFIG_BMA180 is not set
|
||||
# CONFIG_BMA220 is not set
|
||||
# CONFIG_BMC150_ACCEL is not set
|
||||
@ -5037,6 +5130,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
|
||||
# CONFIG_AD7887 is not set
|
||||
# CONFIG_AD7923 is not set
|
||||
# CONFIG_AD799X is not set
|
||||
CONFIG_AXP20X_ADC=y
|
||||
CONFIG_AXP288_ADC=y
|
||||
# CONFIG_CC10001_ADC is not set
|
||||
# CONFIG_ENVELOPE_DETECTOR is not set
|
||||
@ -5044,12 +5138,16 @@ CONFIG_AXP288_ADC=y
|
||||
# CONFIG_HX711 is not set
|
||||
# CONFIG_INA2XX_ADC is not set
|
||||
# CONFIG_LTC2485 is not set
|
||||
# CONFIG_LTC2497 is not set
|
||||
# CONFIG_MAX1027 is not set
|
||||
# CONFIG_MAX11100 is not set
|
||||
# CONFIG_MAX1118 is not set
|
||||
# CONFIG_MAX1363 is not set
|
||||
# CONFIG_MAX9611 is not set
|
||||
# CONFIG_MCP320X is not set
|
||||
# CONFIG_MCP3422 is not set
|
||||
# CONFIG_NAU7802 is not set
|
||||
CONFIG_SUN4I_GPADC=m
|
||||
# CONFIG_TI_ADC081C is not set
|
||||
# CONFIG_TI_ADC0832 is not set
|
||||
# CONFIG_TI_ADC12138 is not set
|
||||
@ -5100,6 +5198,7 @@ CONFIG_AXP288_ADC=y
|
||||
# CONFIG_AD5593R is not set
|
||||
# CONFIG_AD5504 is not set
|
||||
# CONFIG_AD5624R_SPI is not set
|
||||
# CONFIG_LTC2632 is not set
|
||||
# CONFIG_AD5686 is not set
|
||||
# CONFIG_AD5755 is not set
|
||||
# CONFIG_AD5761 is not set
|
||||
@ -5157,6 +5256,7 @@ CONFIG_AXP288_ADC=y
|
||||
# CONFIG_AFE4403 is not set
|
||||
# CONFIG_AFE4404 is not set
|
||||
# CONFIG_MAX30100 is not set
|
||||
# CONFIG_MAX30102 is not set
|
||||
|
||||
#
|
||||
# Humidity sensors
|
||||
@ -5164,6 +5264,7 @@ CONFIG_AXP288_ADC=y
|
||||
# CONFIG_AM2315 is not set
|
||||
CONFIG_DHT11=m
|
||||
# CONFIG_HDC100X is not set
|
||||
# CONFIG_HID_SENSOR_HUMIDITY is not set
|
||||
# CONFIG_HTS221 is not set
|
||||
# CONFIG_HTU21 is not set
|
||||
CONFIG_SI7005=m
|
||||
@ -5216,6 +5317,7 @@ CONFIG_SI7020=m
|
||||
# CONFIG_US5182D is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
# CONFIG_VEML6070 is not set
|
||||
# CONFIG_VL6180 is not set
|
||||
|
||||
#
|
||||
# Magnetometer sensors
|
||||
@ -5287,6 +5389,7 @@ CONFIG_BMP280_SPI=m
|
||||
# Proximity and distance sensors
|
||||
#
|
||||
# CONFIG_LIDAR_LITE_V2 is not set
|
||||
# CONFIG_SRF04 is not set
|
||||
# CONFIG_SX9500 is not set
|
||||
# CONFIG_SRF08 is not set
|
||||
|
||||
@ -5294,6 +5397,7 @@ CONFIG_BMP280_SPI=m
|
||||
# Temperature sensors
|
||||
#
|
||||
# CONFIG_MAXIM_THERMOCOUPLE is not set
|
||||
# CONFIG_HID_SENSOR_TEMP is not set
|
||||
# CONFIG_MLX90614 is not set
|
||||
# CONFIG_TMP006 is not set
|
||||
# CONFIG_TMP007 is not set
|
||||
@ -5312,6 +5416,7 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=y
|
||||
CONFIG_RESET_CONTROLLER=y
|
||||
# CONFIG_RESET_ATH79 is not set
|
||||
# CONFIG_RESET_BERLIN is not set
|
||||
# CONFIG_RESET_IMX7 is not set
|
||||
# CONFIG_RESET_LPC18XX is not set
|
||||
# CONFIG_RESET_MESON is not set
|
||||
# CONFIG_RESET_PISTACHIO is not set
|
||||
@ -5348,6 +5453,7 @@ CONFIG_ARM_PMU=y
|
||||
# Android
|
||||
#
|
||||
# CONFIG_ANDROID is not set
|
||||
CONFIG_DAX=m
|
||||
CONFIG_NVMEM=m
|
||||
CONFIG_NVMEM_SUNXI_SID=m
|
||||
CONFIG_STM=m
|
||||
@ -5366,6 +5472,7 @@ CONFIG_STM_SOURCE_CONSOLE=m
|
||||
# FSI support
|
||||
#
|
||||
# CONFIG_FSI is not set
|
||||
# CONFIG_TEE is not set
|
||||
|
||||
#
|
||||
# Firmware Drivers
|
||||
@ -5376,6 +5483,7 @@ CONFIG_ARM_PSCI_FW=y
|
||||
CONFIG_FW_CFG_SYSFS=m
|
||||
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
|
||||
CONFIG_HAVE_ARM_SMCCC=y
|
||||
# CONFIG_GOOGLE_FIRMWARE is not set
|
||||
|
||||
#
|
||||
# Tegra firmware driver
|
||||
@ -5494,7 +5602,7 @@ CONFIG_NTFS_RW=y
|
||||
CONFIG_PROC_FS=y
|
||||
CONFIG_PROC_SYSCTL=y
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_PROC_CHILDREN is not set
|
||||
CONFIG_PROC_CHILDREN=y
|
||||
CONFIG_KERNFS=y
|
||||
CONFIG_SYSFS=y
|
||||
CONFIG_TMPFS=y
|
||||
@ -5531,6 +5639,7 @@ CONFIG_UBIFS_FS_LZO=y
|
||||
CONFIG_UBIFS_FS_ZLIB=y
|
||||
CONFIG_UBIFS_ATIME_SUPPORT=y
|
||||
CONFIG_UBIFS_FS_ENCRYPTION=y
|
||||
CONFIG_UBIFS_FS_SECURITY=y
|
||||
# CONFIG_CRAMFS is not set
|
||||
CONFIG_SQUASHFS=m
|
||||
CONFIG_SQUASHFS_FILE_CACHE=y
|
||||
@ -5884,13 +5993,13 @@ CONFIG_ENCRYPTED_KEYS=y
|
||||
# CONFIG_KEY_DH_OPERATIONS is not set
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
CONFIG_SECURITY=y
|
||||
# CONFIG_SECURITY_WRITABLE_HOOKS is not set
|
||||
CONFIG_SECURITYFS=y
|
||||
CONFIG_SECURITY_NETWORK=y
|
||||
# CONFIG_SECURITY_NETWORK_XFRM is not set
|
||||
CONFIG_SECURITY_PATH=y
|
||||
CONFIG_LSM_MMAP_MIN_ADDR=32768
|
||||
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
||||
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY is not set
|
||||
# CONFIG_STATIC_USERMODEHELPER is not set
|
||||
CONFIG_SECURITY_SELINUX=y
|
||||
@ -6078,6 +6187,7 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y
|
||||
CONFIG_SYSTEM_TRUSTED_KEYS=""
|
||||
# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
|
||||
# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
|
||||
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
|
||||
CONFIG_ARM_CRYPTO=y
|
||||
CONFIG_CRYPTO_SHA1_ARM=m
|
||||
CONFIG_CRYPTO_SHA1_ARM_NEON=m
|
||||
|
||||
@ -40,10 +40,8 @@ if [[ $USE_MAINLINE_GOOGLE_MIRROR == yes ]]; then
|
||||
else
|
||||
MAINLINE_KERNEL_SOURCE='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
|
||||
fi
|
||||
# allow upgrades for same major.minor versions
|
||||
#ARMBIAN_MAINLINE_KERNEL_VERSION='4.11'
|
||||
#MAINLINE_KERNEL_BRANCH=tag:v$(wget -qO- https://www.kernel.org/finger_banner | awk '{print $NF}' | grep -oE "^${ARMBIAN_MAINLINE_KERNEL_VERSION//./\\.}\.?[[:digit:]]*" | tail -1)
|
||||
MAINLINE_KERNEL_BRANCH='branch:linux-4.11.y'
|
||||
|
||||
MAINLINE_KERNEL_BRANCH='branch:linux-4.12.y'
|
||||
MAINLINE_KERNEL_DIR='linux-vanilla'
|
||||
|
||||
if [[ $USE_GITHUB_UBOOT_MIRROR == yes ]]; then
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
|
||||
index ab30cc63..cc176797 100644
|
||||
index 65f4e2a4..9eb2043c 100644
|
||||
--- a/arch/arm/Makefile
|
||||
+++ b/arch/arm/Makefile
|
||||
@@ -339,6 +339,12 @@ $(INSTALL_TARGETS):
|
||||
@ -16,7 +16,7 @@ index ab30cc63..cc176797 100644
|
||||
|
||||
dtbs: prepare scripts
|
||||
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
|
||||
index 3c79f859..eaaeb17e 100644
|
||||
index 3c79f859..4e5c1d59 100644
|
||||
--- a/arch/arm/boot/.gitignore
|
||||
+++ b/arch/arm/boot/.gitignore
|
||||
@@ -3,4 +3,5 @@ zImage
|
||||
@ -27,10 +27,10 @@ index 3c79f859..eaaeb17e 100644
|
||||
+*.dtb*
|
||||
+*.scr
|
||||
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
|
||||
index b9a4a934..54e3c38d 100644
|
||||
index f839ecd9..9788f16d 100644
|
||||
--- a/arch/arm64/Makefile
|
||||
+++ b/arch/arm64/Makefile
|
||||
@@ -119,6 +119,12 @@ zinstall install:
|
||||
@@ -121,6 +121,12 @@ zinstall install:
|
||||
%.dtb: scripts
|
||||
$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
|
||||
|
||||
@ -44,7 +44,7 @@ index b9a4a934..54e3c38d 100644
|
||||
|
||||
dtbs: prepare scripts
|
||||
diff --git a/arch/arm64/boot/dts/.gitignore b/arch/arm64/boot/dts/.gitignore
|
||||
index b60ed208..5d65b54b 100644
|
||||
index b60ed208..4bec63b6 100644
|
||||
--- a/arch/arm64/boot/dts/.gitignore
|
||||
+++ b/arch/arm64/boot/dts/.gitignore
|
||||
@@ -1 +1,2 @@
|
||||
@ -52,11 +52,11 @@ index b60ed208..5d65b54b 100644
|
||||
+*.dtb*
|
||||
+*.scr
|
||||
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
|
||||
index a1be75d0..ad8dc1c9 100644
|
||||
index 34614a48..8a8313d6 100644
|
||||
--- a/scripts/Makefile.dtbinst
|
||||
+++ b/scripts/Makefile.dtbinst
|
||||
@@ -27,6 +27,9 @@ ifeq ("$(dtbinst-root)", "$(obj)")
|
||||
endif
|
||||
@@ -21,6 +21,9 @@ include scripts/Kbuild.include
|
||||
include $(src)/Makefile
|
||||
|
||||
dtbinst-files := $(dtb-y)
|
||||
+dtboinst-files := $(dtbo-y)
|
||||
@ -65,13 +65,7 @@ index a1be75d0..ad8dc1c9 100644
|
||||
dtbinst-dirs := $(dts-dirs)
|
||||
|
||||
# Helper targets for Installing DTBs into the boot directory
|
||||
@@ -35,15 +38,24 @@ quiet_cmd_dtb_install = INSTALL $<
|
||||
|
||||
install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
|
||||
|
||||
-$(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
|
||||
+$(dtbinst-files) $(dtboinst-files) $(readme-files) $(script-files) $(dtbinst-dirs): | __dtbs_install_prep
|
||||
|
||||
@@ -32,10 +35,19 @@ install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
|
||||
$(dtbinst-files): %.dtb: $(obj)/%.dtb
|
||||
$(call cmd,dtb_install,$(install-dir))
|
||||
|
||||
@ -94,7 +88,7 @@ index a1be75d0..ad8dc1c9 100644
|
||||
|
||||
.PHONY: $(PHONY)
|
||||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
||||
index 0a07f901..5ccd3490 100644
|
||||
index 58c05e5d..2b95dda9 100644
|
||||
--- a/scripts/Makefile.lib
|
||||
+++ b/scripts/Makefile.lib
|
||||
@@ -278,6 +278,9 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
|
||||
@ -106,8 +100,8 @@ index 0a07f901..5ccd3490 100644
|
||||
+
|
||||
# Disable noisy checks by default
|
||||
ifeq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
|
||||
DTC_FLAGS += -Wno-unit_address_vs_reg
|
||||
@@ -312,6 +315,23 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
|
||||
DTC_FLAGS += -Wno-unit_address_vs_reg \
|
||||
@@ -324,6 +327,23 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
|
||||
$(obj)/%.dtb: $(src)/%.dts FORCE
|
||||
$(call if_changed_dep,dtc)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,10 +1,10 @@
|
||||
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
|
||||
index 6c3b038..cc9b3c0 100755
|
||||
index aad67000..006d8ec7 100755
|
||||
--- a/scripts/package/builddeb
|
||||
+++ b/scripts/package/builddeb
|
||||
@@ -27,6 +27,28 @@ create_package() {
|
||||
chown -R root:root "$pdir"
|
||||
chmod -R go-w "$pdir"
|
||||
@@ -29,6 +29,28 @@ create_package() {
|
||||
# in case we are in a restrictive umask environment like 0077
|
||||
chmod -R a+rX "$pdir"
|
||||
|
||||
+ # Create preinstall and post install script to remove dtb
|
||||
+ if [[ "$1" == *dtb* ]]; then
|
||||
@ -20,18 +20,18 @@ index 6c3b038..cc9b3c0 100755
|
||||
+ echo "exit 0" >> $pdir/DEBIAN/postinst
|
||||
+ chmod 775 $pdir/DEBIAN/postinst
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
+ # Create postinstall script for headers
|
||||
+ if [[ "$1" == *headers* ]]; then
|
||||
+ echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
|
||||
+ echo "exit 0" >> $pdir/DEBIAN/postinst
|
||||
+ chmod 775 $pdir/DEBIAN/postinst
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
# Create the package
|
||||
dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
|
||||
dpkg --build "$pdir" ..
|
||||
@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp"
|
||||
@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp"
|
||||
fwdir="$objtree/debian/fwtmp"
|
||||
kernel_headers_dir="$objtree/debian/hdrtmp"
|
||||
libc_headers_dir="$objtree/debian/headertmp"
|
||||
@ -49,7 +49,7 @@ index 6c3b038..cc9b3c0 100755
|
||||
dbg_packagename=$packagename-dbg
|
||||
debarch=
|
||||
forcearch=
|
||||
@@ -124,7 +148,9 @@ esac
|
||||
@@ -126,7 +150,9 @@ esac
|
||||
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
|
||||
|
||||
# Setup the directory structure
|
||||
@ -60,7 +60,7 @@ index 6c3b038..cc9b3c0 100755
|
||||
mkdir -m 755 -p "$tmpdir/DEBIAN"
|
||||
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
|
||||
mkdir -p "$fwdir/lib/firmware/$version/"
|
||||
@@ -183,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
|
||||
@@ -180,6 +206,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -72,28 +72,7 @@ index 6c3b038..cc9b3c0 100755
|
||||
if [ "$ARCH" != "um" ]; then
|
||||
$MAKE headers_check KBUILD_SRC=
|
||||
$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
|
||||
@@ -195,7 +226,7 @@ fi
|
||||
# so do we; recent versions of dracut and initramfs-tools will obey this.
|
||||
debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
|
||||
if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
|
||||
- want_initrd=Yes
|
||||
+ want_initrd=Yes
|
||||
else
|
||||
want_initrd=No
|
||||
fi
|
||||
@@ -207,9 +238,11 @@ for script in postinst postrm preinst prerm ; do
|
||||
set -e
|
||||
|
||||
# Pass maintainer script parameters to hook scripts
|
||||
+
|
||||
export DEB_MAINT_PARAMS="\$*"
|
||||
|
||||
# Tell initramfs builder whether it's wanted
|
||||
+
|
||||
export INITRD=$want_initrd
|
||||
|
||||
test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
|
||||
@@ -218,6 +251,55 @@ EOF
|
||||
@@ -215,6 +246,55 @@ EOF
|
||||
chmod 755 "$tmpdir/DEBIAN/$script"
|
||||
done
|
||||
|
||||
@ -149,33 +128,23 @@ index 6c3b038..cc9b3c0 100755
|
||||
# Try to determine maintainer and email values
|
||||
if [ -n "$DEBEMAIL" ]; then
|
||||
email=$DEBEMAIL
|
||||
@@ -328,16 +414,24 @@ fi
|
||||
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
|
||||
@@ -329,12 +409,15 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
|
||||
fi
|
||||
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
|
||||
mkdir -p "$destdir"
|
||||
+######################## headers patch
|
||||
+ZACNI=$(pwd)
|
||||
+cd $destdir
|
||||
+patch -p1 < /tmp/headers-debian-byteshift.patch
|
||||
+cd $ZACNI
|
||||
+######################## headers patch
|
||||
+(cd $destdir; patch -p1 < /tmp/headers-debian-byteshift.patch)
|
||||
(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
|
||||
(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
|
||||
(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
|
||||
ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
|
||||
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
|
||||
|
||||
+(cd "$destdir"; make M=scripts clean)
|
||||
+(cd $destdir; make M=scripts clean)
|
||||
+
|
||||
cat <<EOF >> debian/control
|
||||
|
||||
Package: $kernel_headers_packagename
|
||||
-Provides: linux-headers, linux-headers-2.6
|
||||
+Provides: linux-headers
|
||||
Architecture: any
|
||||
Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
|
||||
This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
|
||||
@@ -363,6 +457,16 @@ fi
|
||||
@@ -363,6 +446,16 @@ fi
|
||||
|
||||
cat <<EOF >> debian/control
|
||||
|
||||
@ -192,7 +161,7 @@ index 6c3b038..cc9b3c0 100755
|
||||
Package: $libc_headers_packagename
|
||||
Section: devel
|
||||
Provides: linux-kernel-headers
|
||||
@@ -374,7 +478,7 @@ EOF
|
||||
@@ -374,7 +467,7 @@ EOF
|
||||
|
||||
if [ "$ARCH" != "um" ]; then
|
||||
create_package "$kernel_headers_packagename" "$kernel_headers_dir"
|
||||
|
||||
@ -1,198 +0,0 @@
|
||||
From b56f5cbc7e08ec7d31c42fc41e5247677f20b143 Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Date: Tue, 14 Feb 2017 21:51:01 +0000
|
||||
Subject: crypto: arm/aes-neonbs - resolve fallback cipher at runtime
|
||||
|
||||
Currently, the bit sliced NEON AES code for ARM has a link time
|
||||
dependency on the scalar ARM asm implementation, which it uses as a
|
||||
fallback to perform CBC encryption and the encryption of the initial
|
||||
XTS tweak.
|
||||
|
||||
The bit sliced NEON code is both fast and time invariant, which makes
|
||||
it a reasonable default on hardware that supports it. However, the
|
||||
ARM asm code it pulls in is not time invariant, and due to the way it
|
||||
is linked in, cannot be overridden by the new generic time invariant
|
||||
driver. In fact, it will not be used at all, given that the ARM asm
|
||||
code registers itself as a cipher with a priority that exceeds the
|
||||
priority of the fixed time cipher.
|
||||
|
||||
So remove the link time dependency, and allocate the fallback cipher
|
||||
via the crypto API. Note that this requires this driver's module_init
|
||||
call to be replaced with late_initcall, so that the (possibly generic)
|
||||
fallback cipher is guaranteed to be available when the builtin test
|
||||
is performed at registration time.
|
||||
|
||||
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
---
|
||||
arch/arm/crypto/Kconfig | 2 +-
|
||||
arch/arm/crypto/aes-neonbs-glue.c | 60 +++++++++++++++++++++++++++++----------
|
||||
2 files changed, 46 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
|
||||
index a8fce93..b9adedc 100644
|
||||
--- a/arch/arm/crypto/Kconfig
|
||||
+++ b/arch/arm/crypto/Kconfig
|
||||
@@ -73,7 +73,7 @@ config CRYPTO_AES_ARM_BS
|
||||
depends on KERNEL_MODE_NEON
|
||||
select CRYPTO_BLKCIPHER
|
||||
select CRYPTO_SIMD
|
||||
- select CRYPTO_AES_ARM
|
||||
+ select CRYPTO_AES
|
||||
help
|
||||
Use a faster and more secure NEON based implementation of AES in CBC,
|
||||
CTR and XTS modes
|
||||
diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
|
||||
index 2920b96..c763779 100644
|
||||
--- a/arch/arm/crypto/aes-neonbs-glue.c
|
||||
+++ b/arch/arm/crypto/aes-neonbs-glue.c
|
||||
@@ -42,9 +42,6 @@ asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||
asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||
int rounds, int blocks, u8 iv[]);
|
||||
|
||||
-asmlinkage void __aes_arm_encrypt(const u32 rk[], int rounds, const u8 in[],
|
||||
- u8 out[]);
|
||||
-
|
||||
struct aesbs_ctx {
|
||||
int rounds;
|
||||
u8 rk[13 * (8 * AES_BLOCK_SIZE) + 32] __aligned(AES_BLOCK_SIZE);
|
||||
@@ -52,12 +49,12 @@ struct aesbs_ctx {
|
||||
|
||||
struct aesbs_cbc_ctx {
|
||||
struct aesbs_ctx key;
|
||||
- u32 enc[AES_MAX_KEYLENGTH_U32];
|
||||
+ struct crypto_cipher *enc_tfm;
|
||||
};
|
||||
|
||||
struct aesbs_xts_ctx {
|
||||
struct aesbs_ctx key;
|
||||
- u32 twkey[AES_MAX_KEYLENGTH_U32];
|
||||
+ struct crypto_cipher *tweak_tfm;
|
||||
};
|
||||
|
||||
static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
@@ -132,20 +129,18 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
|
||||
ctx->key.rounds = 6 + key_len / 4;
|
||||
|
||||
- memcpy(ctx->enc, rk.key_enc, sizeof(ctx->enc));
|
||||
-
|
||||
kernel_neon_begin();
|
||||
aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds);
|
||||
kernel_neon_end();
|
||||
|
||||
- return 0;
|
||||
+ return crypto_cipher_setkey(ctx->enc_tfm, in_key, key_len);
|
||||
}
|
||||
|
||||
static void cbc_encrypt_one(struct crypto_skcipher *tfm, const u8 *src, u8 *dst)
|
||||
{
|
||||
struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
|
||||
- __aes_arm_encrypt(ctx->enc, ctx->key.rounds, src, dst);
|
||||
+ crypto_cipher_encrypt_one(ctx->enc_tfm, dst, src);
|
||||
}
|
||||
|
||||
static int cbc_encrypt(struct skcipher_request *req)
|
||||
@@ -181,6 +176,23 @@ static int cbc_decrypt(struct skcipher_request *req)
|
||||
return err;
|
||||
}
|
||||
|
||||
+static int cbc_init(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ ctx->enc_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||
+ if (IS_ERR(ctx->enc_tfm))
|
||||
+ return PTR_ERR(ctx->enc_tfm);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void cbc_exit(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ crypto_free_cipher(ctx->enc_tfm);
|
||||
+}
|
||||
+
|
||||
static int ctr_encrypt(struct skcipher_request *req)
|
||||
{
|
||||
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
|
||||
@@ -228,7 +240,6 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
unsigned int key_len)
|
||||
{
|
||||
struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
- struct crypto_aes_ctx rk;
|
||||
int err;
|
||||
|
||||
err = xts_verify_key(tfm, in_key, key_len);
|
||||
@@ -236,15 +247,30 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
return err;
|
||||
|
||||
key_len /= 2;
|
||||
- err = crypto_aes_expand_key(&rk, in_key + key_len, key_len);
|
||||
+ err = crypto_cipher_setkey(ctx->tweak_tfm, in_key + key_len, key_len);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
- memcpy(ctx->twkey, rk.key_enc, sizeof(ctx->twkey));
|
||||
-
|
||||
return aesbs_setkey(tfm, in_key, key_len);
|
||||
}
|
||||
|
||||
+static int xts_init(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ ctx->tweak_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||
+ if (IS_ERR(ctx->tweak_tfm))
|
||||
+ return PTR_ERR(ctx->tweak_tfm);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void xts_exit(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ crypto_free_cipher(ctx->tweak_tfm);
|
||||
+}
|
||||
+
|
||||
static int __xts_crypt(struct skcipher_request *req,
|
||||
void (*fn)(u8 out[], u8 const in[], u8 const rk[],
|
||||
int rounds, int blocks, u8 iv[]))
|
||||
@@ -256,7 +282,7 @@ static int __xts_crypt(struct skcipher_request *req,
|
||||
|
||||
err = skcipher_walk_virt(&walk, req, true);
|
||||
|
||||
- __aes_arm_encrypt(ctx->twkey, ctx->key.rounds, walk.iv, walk.iv);
|
||||
+ crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv);
|
||||
|
||||
kernel_neon_begin();
|
||||
while (walk.nbytes >= AES_BLOCK_SIZE) {
|
||||
@@ -309,6 +335,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||
.base.cra_ctxsize = sizeof(struct aesbs_cbc_ctx),
|
||||
.base.cra_module = THIS_MODULE,
|
||||
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||
+ .base.cra_init = cbc_init,
|
||||
+ .base.cra_exit = cbc_exit,
|
||||
|
||||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
@@ -342,6 +370,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||
.base.cra_ctxsize = sizeof(struct aesbs_xts_ctx),
|
||||
.base.cra_module = THIS_MODULE,
|
||||
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||
+ .base.cra_init = xts_init,
|
||||
+ .base.cra_exit = xts_exit,
|
||||
|
||||
.min_keysize = 2 * AES_MIN_KEY_SIZE,
|
||||
.max_keysize = 2 * AES_MAX_KEY_SIZE,
|
||||
@@ -402,5 +432,5 @@ unregister_simds:
|
||||
return err;
|
||||
}
|
||||
|
||||
-module_init(aes_init);
|
||||
+late_initcall(aes_init);
|
||||
module_exit(aes_exit);
|
||||
--
|
||||
cgit v1.1
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user