Cubox and hummingboard 1 / 2 patch fixes, adjustment, tested kernel 4.3.3

2025-07-24 05:48:41 +00:00 · 2015-12-25 14:32:23 +01:00 · 2015-12-25 14:32:23 +01:00 · a2af002779
commit a2af002779
parent 6b8a04453e
5 changed files with 193 additions and 102 deletions
--- a/config/linux-cubox-next.config
+++ b/config/linux-cubox-next.config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.0-rc5 Kernel Configuration
+# Linux/arm 4.3.3 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@ -31,7 +31,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
@ -246,6 +246,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
@ -327,6 +328,7 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_SHMOBILE_LEGACY is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
@ -490,7 +492,6 @@ CONFIG_PCI_IMX6=y
 # CONFIG_PCI_HOST_GENERIC is not set
 # CONFIG_PCI_LAYERSCAPE is not set
 # CONFIG_PCIE_IPROC is not set
-# CONFIG_PCIE_ALTERA is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
@ -518,7 +519,6 @@ CONFIG_HAVE_ARM_TWD=y
 # CONFIG_MCPM is not set
 # CONFIG_BIG_LITTLE is not set
 # CONFIG_VMSPLIT_3G is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VMSPLIT_2G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0x80000000
@ -557,6 +557,7 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_NO_BOOTMEM=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
@ -816,7 +817,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_PROTO_DCCP=m
@ -1099,7 +1100,6 @@ CONFIG_DNS_RESOLVER=y
 # CONFIG_MPLS is not set
 # CONFIG_HSR is not set
 # CONFIG_NET_SWITCHDEV is not set
-# CONFIG_NET_L3_MASTER_DEV is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@ -1211,7 +1211,6 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_LIB80211=y
 CONFIG_LIB80211_CRYPT_WEP=y
@ -1452,6 +1451,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NVME is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@ -1461,7 +1461,6 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 # CONFIG_MG_DISK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set

 #
 # Misc devices
@ -1537,10 +1536,6 @@ CONFIG_EEPROM_93CX6=m
 #
 # SCIF Driver
 #
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_KERNEL_API is not set
@ -1597,7 +1592,6 @@ CONFIG_SATA_PMP=y
 # CONFIG_SATA_AHCI_PLATFORM is not set
 CONFIG_AHCI_IMX=y
 # CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_ACARD_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
@ -1666,6 +1660,7 @@ CONFIG_TUN=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 # CONFIG_NLMON is not set
+# CONFIG_NET_VRF is not set
 # CONFIG_ARCNET is not set

 #
@ -1699,7 +1694,6 @@ CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL1E is not set
 # CONFIG_ATL1C is not set
 # CONFIG_ALX is not set
-# CONFIG_NET_VENDOR_AURORA is not set
 CONFIG_NET_CADENCE=y
 # CONFIG_MACB is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
@ -1739,6 +1733,7 @@ CONFIG_FEC=y
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
 # CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_IP1000 is not set
 # CONFIG_JME is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 CONFIG_NET_VENDOR_MELLANOX=y
@ -1764,7 +1759,6 @@ CONFIG_NET_VENDOR_QLOGIC=y
 # CONFIG_QLCNIC is not set
 # CONFIG_QLGE is not set
 # CONFIG_NETXEN_NIC is not set
-# CONFIG_QED is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
@ -1904,10 +1898,10 @@ CONFIG_WLAN=y
 # CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
-# CONFIG_ADM8211 is not set
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
+# CONFIG_ADM8211 is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_MWL8K is not set
 CONFIG_ATH_CARDS=m
@ -1985,8 +1979,6 @@ CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_USB=m
 CONFIG_RTLWIFI_DEBUG=y
 CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
 # CONFIG_WL_TI is not set
 # CONFIG_ZD1211RW is not set
 # CONFIG_MWIFIEX is not set
@ -2005,7 +1997,6 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 # CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set

 #
 # Input device support
@ -2126,7 +2117,6 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
-# CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set

 #
@ -2367,11 +2357,10 @@ CONFIG_GPIO_74XX_MMIO=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_GRGPIO is not set
 CONFIG_GPIO_MXC=y
+# CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZX is not set

 #
 # I2C GPIO expanders
@ -2403,12 +2392,9 @@ CONFIG_GPIO_PCA953X=y
 #
 # CONFIG_GPIO_74X164 is not set
 # CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MC33880 is not set
-
-#
-# SPI or I2C GPIO expanders
-#
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_ZX is not set

 #
 # USB GPIO expanders
@ -2454,7 +2440,7 @@ CONFIG_BATTERY_DS2760=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_DA9052 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
@ -2532,7 +2518,6 @@ CONFIG_SENSORS_IIO_HWMON=m
 # CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_HTU21 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_ADCXX is not set
@ -2636,7 +2621,6 @@ CONFIG_WATCHDOG_CORE=y
 CONFIG_IMX2_WDT=y
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_I6300ESB_WDT is not set
-# CONFIG_BCM7038_WDT is not set
 # CONFIG_MEN_A21_WDT is not set

 #
@ -2670,7 +2654,6 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_AXP20X is not set
@ -3373,7 +3356,6 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
@ -3431,11 +3413,11 @@ CONFIG_SND_PCM=y
 CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_TIMER=y
 CONFIG_SND_HRTIMER=m
 # CONFIG_SND_DYNAMIC_MINORS is not set
 CONFIG_SND_SUPPORT_OLD_API=y
@ -3560,11 +3542,6 @@ CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_SPDIF=y
 # CONFIG_SND_SOC_IMX_MC13783 is not set
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
-
-#
-# Allwinner SoC Audio support
-#
-# CONFIG_SND_SUN4I_CODEC is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y

@ -3575,7 +3552,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ADAU1701 is not set
 # 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
@ -3591,6 +3567,7 @@ CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS4271_SPI=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_HDMI_CODEC is not set
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
@ -3662,7 +3639,6 @@ CONFIG_HID_BELKIN=m
 # CONFIG_HID_BETOP_FF is not set
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
-# CONFIG_HID_CORSAIR is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CP2112 is not set
 CONFIG_HID_CYPRESS=m
@ -3673,7 +3649,6 @@ CONFIG_HID_ELECOM=m
 # CONFIG_HID_ELO is not set
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
 CONFIG_HID_HOLTEK=m
 # CONFIG_HOLTEK_FF is not set
 # CONFIG_HID_GT683R is not set
@ -3759,6 +3734,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
 CONFIG_USB_ULPI_BUS=m
 # CONFIG_USB_MON is not set
 # CONFIG_USB_WUSB_CBAF is not set
@ -3777,6 +3753,7 @@ CONFIG_USB_EHCI_PCI=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_FUSBH200_HCD is not set
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 # CONFIG_USB_OHCI_HCD is not set
@ -4013,6 +3990,7 @@ CONFIG_USB_LED_TRIG=y
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_CLKGATE is not set

 #
 # MMC/SD/SDIO Card Drivers
@ -4032,7 +4010,6 @@ CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
-CONFIG_MMC_SDHCI_OF_ESDHC=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 # CONFIG_MMC_MXC is not set
@ -4155,7 +4132,6 @@ CONFIG_RTC_DRV_PCF8523=y
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_RV3029C2 is not set
-# CONFIG_RTC_DRV_RV8803 is not set

 #
 # SPI RTC drivers
@ -4218,13 +4194,14 @@ CONFIG_DMA_OF=y
 # CONFIG_FSL_EDMA is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_SDMA=y
-# CONFIG_INTEL_IDMA64 is not set
+# CONFIG_IDMA64 is not set
 CONFIG_MXS_DMA=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 # CONFIG_NBPFAXI_DMA is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
+# CONFIG_HSU_DMA_PCI is not set

 #
 # DMA Clients
@ -4357,6 +4334,7 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
+# CONFIG_FT1000 is not set

 #
 # Speakup console speech
@ -4411,7 +4389,6 @@ CONFIG_FB_TFT_SSD1306=m
 CONFIG_FB_TFT_SSD1331=m
 CONFIG_FB_TFT_SSD1351=m
 CONFIG_FB_TFT_ST7735R=m
-CONFIG_FB_TFT_ST7789V=m
 CONFIG_FB_TFT_TINYLCD=m
 CONFIG_FB_TFT_TLS8204=m
 CONFIG_FB_TFT_UC1611=m
@ -4420,7 +4397,6 @@ CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
-# CONFIG_WILC1000_DRIVER is not set
 # CONFIG_MOST is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@ -4431,7 +4407,6 @@ CONFIG_COMMON_CLK=y
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_CLK_QORIQ is not set
@ -4447,7 +4422,6 @@ CONFIG_COMMON_CLK=y
 # Clock Source drivers
 #
 CONFIG_CLKSRC_OF=y
-CONFIG_CLKSRC_PROBE=y
 CONFIG_CLKSRC_MMIO=y
 # CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_ATMEL_PIT is not set
@ -4471,7 +4445,6 @@ CONFIG_CLKSRC_IMX_GPT=y
 #
 # SOC (System On Chip) specific Drivers
 #
-# CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_PM_DEVFREQ is not set
@ -4493,15 +4466,12 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_TRIGGERED_EVENT=m

 #
 # Accelerometers
 #
 CONFIG_BMA180=m
 CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
@ -4510,7 +4480,6 @@ CONFIG_KXCJK1013=m
 CONFIG_MMA8452=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
-# CONFIG_MXC4005 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set

@ -4528,7 +4497,6 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD799X=m
 CONFIG_CC10001_ADC=m
-CONFIG_HI8435=m
 CONFIG_MAX1027=m
 CONFIG_MAX1363=m
 CONFIG_MCP320X=m
@ -4543,15 +4511,9 @@ CONFIG_VF610_ADC=m
 #
 CONFIG_AD8366=m

-#
-# Chemical Sensors
-#
-# CONFIG_VZ89X is not set
-
 #
 # Hid Sensor IIO Common
 #
-CONFIG_IIO_MS_SENSORS_I2C=m

 #
 # SSP Sensor Common
@ -4607,8 +4569,6 @@ CONFIG_ADIS16136=m
 CONFIG_ADIS16260=m
 CONFIG_ADXRS450=m
 CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
@ -4618,8 +4578,6 @@ CONFIG_ITG3200=m
 # Humidity sensors
 #
 CONFIG_DHT11=m
-CONFIG_HDC100X=m
-CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m

@ -4639,7 +4597,6 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y
 CONFIG_ADJD_S311=m
 CONFIG_AL3320A=m
 CONFIG_APDS9300=m
-CONFIG_APDS9960=m
 CONFIG_BH1750=m
 CONFIG_CM32181=m
 CONFIG_CM3232=m
@ -4657,7 +4614,6 @@ CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
 CONFIG_TSL4531=m
-CONFIG_US5182D=m
 CONFIG_VCNL4000=m

 #
@ -4665,12 +4621,12 @@ CONFIG_VCNL4000=m
 #
 CONFIG_AK8975=m
 CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
 CONFIG_MAG3110=m
 CONFIG_MMC35240=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_BMC150_MAGN=m

 #
 # Inclinometer sensors
@ -4682,11 +4638,6 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m

-#
-# Digital potentiometers
-#
-CONFIG_MCP4531=m
-
 #
 # Pressure sensors
 #
@ -4696,7 +4647,6 @@ CONFIG_MPL3115=m
 CONFIG_MS5611=m
 CONFIG_MS5611_I2C=m
 CONFIG_MS5611_SPI=m
-CONFIG_MS5637=m
 CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
@ -4710,7 +4660,6 @@ CONFIG_AS3935=m
 #
 # Proximity sensors
 #
-CONFIG_LIDAR_LITE_V2=m
 CONFIG_SX9500=m

 #
@ -4718,8 +4667,6 @@ CONFIG_SX9500=m
 #
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
@ -4757,15 +4704,6 @@ CONFIG_RAS=y
 #
 # CONFIG_ANDROID is not set
 # CONFIG_NVMEM is not set
-# CONFIG_STM is not set
-# CONFIG_STM_DUMMY is not set
-# CONFIG_STM_SOURCE_CONSOLE is not set
-# CONFIG_INTEL_TH is not set
-
-#
-# FPGA Configuration Support
-#
-# CONFIG_FPGA is not set

 #
 # Firmware Drivers
@ -4895,7 +4833,6 @@ CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
 # CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_SQUASHFS is not set
@ -5038,7 +4975,6 @@ CONFIG_FRAME_WARN=1024
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@ -5132,7 +5068,6 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_UPROBE_EVENT is not set
 # CONFIG_PROBE_EVENTS is not set
 # CONFIG_TRACEPOINT_BENCHMARK is not set
-CONFIG_TRACING_EVENTS_GPIO=y

 #
 # Runtime Testing
@ -5148,7 +5083,6 @@ CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
@ -5257,7 +5191,6 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_LRW=y
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m

 #
 # Hash modes
@ -5347,7 +5280,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_LE=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
 # CONFIG_CRYPTO_DEV_SAHARA is not set
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set

 #
--- a/configuration.sh
+++ b/configuration.sh
@ -349,7 +349,11 @@
 		cubox)
 			KERNEL_DEFAULT='https://github.com/linux4kix/linux-linaro-stable-mx6'
 			KERNEL_DEFAULT_BRANCH="imx_3.14.28_1.0.0_ga_neo_dev"
-			KERNEL_DEFAULT_SOURCE="linux-linaro-lsk-v3.14-mx6"		
+			KERNEL_DEFAULT_SOURCE="linux-linaro-lsk-v3.14-mx6"
+			KERNEL_NEXT='git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
+			[ "$USE_MAINLINE_GOOGLE_MIRROR" = "yes" ] && KERNEL_NEXT='https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable'
+			KERNEL_NEXT_BRANCH="v"`wget -qO-  https://www.kernel.org/finger_banner | grep "The latest st" | awk '{print $NF}' | head -1`
+			KERNEL_NEXT_SOURCE="linux-vanilla"
 			UBOOT_DEFAULT="https://github.com/SolidRun/u-boot-imx6"
 			UBOOT_DEFAULT_BRANCH="imx6"
 			UBOOT_DEFAULT_SOURCE="u-boot-cubox"
--- a/patch/kernel/cubox-next/Linux-4.4-hummingboard2.patch
+++ b/patch/kernel/cubox-next/Linux-4.4-hummingboard2.patch
@ -1,5 +1,5 @@
--- ./arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi.orig	2015-12-15 15:18:41.320644953 -0700
-+++ ./arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi	2015-12-16 02:48:16.816417010 -0700
+--- /dev/null 
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -0,0 +1,625 @@
 +/*
 + * Copyright (C) 2013,2014 Russell King
@ -626,8 +626,8 @@
 +	status = "okay";
 +};
 +
--- ./arch/arm/boot/dts/imx6dl-hummingboard2.dts.orig	2015-12-15 15:19:27.390747892 -0700
-+++ ./arch/arm/boot/dts/imx6dl-hummingboard2.dts	2015-12-15 15:30:50.092403376 -0700
+--- /dev/null 
+++ b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
@@ -0,0 +1,52 @@
 +/*
 + * Device Tree file for SolidRun HummingBoard2
@ -681,8 +681,8 @@
 +	model = "SolidRun HummingBoard2 Solo/DualLite";
 +	compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
 +};
--- ./arch/arm/boot/dts/imx6q-hummingboard2.dts.orig	2015-12-15 15:19:33.606611936 -0700
-+++ ./arch/arm/boot/dts/imx6q-hummingboard2.dts	2015-12-15 15:30:21.134988954 -0700
+--- /dev/null 
+++ b/arch/arm/boot/dts/imx6q-hummingboard2.dts
@@ -0,0 +1,60 @@
 +/*
 + * Device Tree file for SolidRun HummingBoard2
@ -744,14 +744,13 @@
 +	fsl,transmit-atten-16ths = <9>;
 +	fsl,no-spread-spectrum;
 +};
--- ./arch/arm/boot/dts/Makefile.orig	2015-12-13 18:42:58.000000000 -0700
-+++ ./arch/arm/boot/dts/Makefile	2015-12-15 15:32:09.961798115 -0700
-@@ -294,6 +294,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
+@@ -294,5 +294,6 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6dl-gw551x.dtb \
 	imx6dl-gw552x.dtb \
 	imx6dl-hummingboard.dtb \
 +	imx6dl-hummingboard2.dtb \
- 	imx6dl-nit6xlite.dtb \
 	imx6dl-nitrogen6x.dtb \
 	imx6dl-phytec-pbab01.dtb \
@@ -323,6 +324,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
--- a/patch/kernel/cubox-next/headers-packing.patch
+++ b/patch/kernel/cubox-next/headers-packing.patch
@ -0,0 +1,13 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 6c3b038..616aa9b 100755
+--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
+@@ -334,6 +334,8 @@ mkdir -p "$destdir"
+ ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
+ rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+ 
+olddir="$(pwd)"; cd "$destdir"; make M=scripts clean; cd $olddir
+
+ cat <<EOF >> debian/control
+ 
+ Package: $kernel_headers_packagename
--- a/patch/kernel/cubox-next/packaging-next.patch
+++ b/patch/kernel/cubox-next/packaging-next.patch
@ -0,0 +1,143 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 88dbf23..fc023a9 100755
+--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
+@@ -80,11 +80,13 @@ tmpdir="$objtree/debian/tmp"
+ fwdir="$objtree/debian/fwtmp"
+ kernel_headers_dir="$objtree/debian/hdrtmp"
+ libc_headers_dir="$objtree/debian/headertmp"
+dtb_dir="$objtree/debian/dtbtmp"
+ dbg_dir="$objtree/debian/dbgtmp"
+-packagename=linux-image-$version
+-fwpackagename=linux-firmware-image-$version
+-kernel_headers_packagename=linux-headers-$version
+-libc_headers_packagename=linux-libc-dev
+packagename=linux-image-next"$LOCALVERSION"
+fwpackagename=linux-firmware-image-next"$LOCALVERSION"
+kernel_headers_packagename=linux-headers-next"$LOCALVERSION"
+dtb_packagename=linux-dtb-next"$LOCALVERSION"
+libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION"
+ dbg_packagename=$packagename-dbg
+ 
+ if [ "$ARCH" = "um" ] ; then
+@@ -108,6 +110,8 @@ esac
+ BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
+ 
+ # Setup the directory structure
+-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
+mkdir -m 755 -p "$dtb_dir/DEBIAN"
+mkdir -p "$dtb_dir/boot/dtb" "$dtb_dir/usr/share/doc/$dtb_packagename"
+ mkdir -m 755 -p "$tmpdir/DEBIAN"
+ mkdir -p "$tmpdir/lib" "$tmpdir/boot"
+@@ -165,6 +171,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ 	fi
+ fi
+ 
+if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
+	#mkdir -p "$tmpdir/boot/dtb"
+	INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
+fi
+
+ if [ "$ARCH" != "um" ]; then
+ 	$MAKE headers_check KBUILD_SRC=
+ 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
+@@ -177,7 +188,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
+@@ -189,9 +200,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
+@@ -200,6 +213,29 @@ EOF
+ 	chmod 755 "$tmpdir/DEBIAN/$script"
+ done
+ 
+##
+## Create sym link to kernel image
+##
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
+cat >> $tmpdir/DEBIAN/postinst <<EOT 
+if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
+mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
+rm -f /$installed_image_path /boot/zImage
+else
+ln -sf /$installed_image_path /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
+fi
+touch /boot/.next
+exit 0
+EOT
+##
+## FAT install workaround
+##
+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
+cat >> $tmpdir/DEBIAN/preinst <<EOT 
+rm -f /boot/System.map* /boot/config* /$installed_image_path /boot/zImage
+EOT
+echo "exit 0" >> $tmpdir/DEBIAN/preinst 
+
+ # Try to determine maintainer and email values
+ if [ -n "$DEBEMAIL" ]; then
+        email=$DEBEMAIL
+@@ -306,6 +342,12 @@ fi
+ (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
+ 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 $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
+@@ -315,7 +357,7 @@ rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+ 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}
+@@ -341,6 +383,16 @@ fi
+ 
+ cat <<EOF >> debian/control
+ 
+Package: $dtb_packagename
+Architecture: any
+Description: Linux DTB, version $version
+ This package contains device blobs from the Linux kernel, version $version.
+EOF
+
+create_package "$dtb_packagename" "$dtb_dir"
+
+cat <<EOF >> debian/control
+
+ Package: $libc_headers_packagename
+ Section: devel
+ Provides: linux-kernel-headers
+@@ -352,7 +404,7 @@ EOF
+ 
+ if [ "$ARCH" != "um" ]; then
+ 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
+-	create_package "$libc_headers_packagename" "$libc_headers_dir"
+#	create_package "$libc_headers_packagename" "$libc_headers_dir"
+ fi
+ 
+ create_package "$packagename" "$tmpdir"