main/linux-vanilla: enable drivers for cubieboards

synchronize with linux-grsec config

2 files changed, 55 insertions, 8 deletions

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 068bb618b2..16abb9ed29 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux vanilla kernel"
 url="http://kernel.org"
 depends="mkinitfs linux-firmware"
@@ -164,19 +164,19 @@ dev() {
 
 md5sums="9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
 a6dfa9d305a9625396f09d6ec35eede8  config-vanilla.aarch64
-1b986f138b3bd1e920515ced30578268  config-vanilla.armhf
+6f923d5029129429bceae658a832ff4c  config-vanilla.armhf
 60c2b6b5d9c671470fff8266555ad3d8  config-vanilla.x86
 1b7e060937dd969d42480e48b516b721  config-vanilla.x86_64
 12786f8aef0ad2f87cbf95a68f34cb56  patch-4.4.15.xz"
 sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2  linux-4.4.tar.xz
 dea3531c6aac5419789d8d5c9f018faf65e7b87ae0c11726b8827edd381bbac6  config-vanilla.aarch64
-044c2eac9428c94ef784fc70a232ce0b88c10e70b4612d4d6061bee223884b2e  config-vanilla.armhf
+6a923534767f24e0adc515e4c29ee7b95498be4fc0c9ba61142669bacd8d7cb0  config-vanilla.armhf
 e7df86b65f7064eca60b8ac5a21260161a4eae8a48b6dfe7f057751f119c492a  config-vanilla.x86
 70d4f132f8fd55df918b7f6a1348b9901644117c48acb4cff6731e461ef538a9  config-vanilla.x86_64
 69fcb928e4958f87fb134d0f6acf98072655b5572dd3497c3a0844882f261bf8  patch-4.4.15.xz"
 sha512sums="13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e  linux-4.4.tar.xz
 e54a65b033615e31922e00605b7e393a92cde51984ebd4dffd5fbf5dad697ce9b79e8c2983ea23f307b3fd57ca6e56f18ae5c7377d780039b03dab3e9bc82671  config-vanilla.aarch64
-cb748b5129e1f60ff9734223c1f88b213d15ba405cbea4d2dc737acdc76efbdf9f102ea08f68c6343db19522ef22df52fe61b9c353f41339790c751897393e70  config-vanilla.armhf
+b31f3708f177f4841e89e7eb01a4e93bd977c79f3255522c01c1664d36fd680dfaf31fb407d6e00b0a4dcee31f8e7daba5119b51377a3a6056f37aefb9067da2  config-vanilla.armhf
 84f1779ab4ee7bbdcddca2c713947af0768d2b29e53f607c728b7c2f7de64bf5d9b5e1556e0d2a8479ff7a15a8532e38fd949098fd478bcbf571707d0aef5c3c  config-vanilla.x86
 cacc61470c25934fff51dcdf2f6188aeb833eb881399d6b7f97548e399095c3279704655dc090ce3a56c089e8b0fb101e1469500f79b4fd28b4335658435b901  config-vanilla.x86_64
 1522839ac4f1330db34618a20712e42ae85d4961b2d2a699723c2675f065f52b07127bb96b33944ee519448027dcd402a31503d748debb12f05fb0f2896b3d73  patch-4.4.15.xz"
diff --git a/main/linux-vanilla/config-vanilla.armhf b/main/linux-vanilla/config-vanilla.armhf
index d9a4c661a9..71b112e4ae 100644
--- a/main/linux-vanilla/config-vanilla.armhf
+++ b/main/linux-vanilla/config-vanilla.armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.6 Kernel Configuration
+# Linux/arm 4.4.15 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -423,7 +423,13 @@ CONFIG_ARCH_MSM8974=y
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SHMOBILE_MULTI is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+CONFIG_MACH_SUN9I=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
@@ -522,7 +528,7 @@ CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=0
+CONFIG_ARCH_NR_GPIO=416
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -1495,6 +1501,7 @@ CONFIG_ARM_CCI500_PMU=y
 CONFIG_ARM_CCN=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_IMX_WEIM is not set
+CONFIG_SUNXI_RSB=y
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
@@ -1600,6 +1607,7 @@ CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_BRCMNAND is not set
 CONFIG_MTD_NAND_PLATFORM=m
 # CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_SUNXI is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 CONFIG_MTD_ONENAND=m
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
@@ -1802,6 +1810,7 @@ CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_SUNXI=m
 # CONFIG_AHCI_QORIQ is not set
 CONFIG_ATA_SFF=y
 
@@ -1926,6 +1935,8 @@ CONFIG_VHOST=m
 # CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_ALLWINNER=y
+# CONFIG_SUN4I_EMAC is not set
 CONFIG_ALTERA_TSE=m
 CONFIG_NET_VENDOR_ARC=y
 # CONFIG_ARC_EMAC is not set
@@ -2024,6 +2035,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_FIXED_PHY=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_SUN4I is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_BCM_UNIMAC=m
@@ -2299,6 +2311,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_CAP11XX is not set
@@ -2389,6 +2402,7 @@ CONFIG_TOUCHSCREEN_TSC2004=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_SUN4I is not set
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 CONFIG_TOUCHSCREEN_TPS6507X=m
@@ -2445,6 +2459,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_SUN4I_PS2 is not set
 # CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set
 
@@ -2579,6 +2594,7 @@ CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_IMX=m
+# CONFIG_I2C_MV64XXX is not set
 # CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
@@ -2586,6 +2602,7 @@ CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_QUP=m
 # CONFIG_I2C_RK3X is not set
 CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_SUN6I_P2WI is not set
 # CONFIG_I2C_VERSATILE is not set
 CONFIG_I2C_XILINX=m
 
@@ -2628,6 +2645,8 @@ CONFIG_SPI_IMX=m
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_QUP=m
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SUN4I is not set
+# CONFIG_SPI_SUN6I is not set
 CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
@@ -2694,6 +2713,19 @@ CONFIG_PINCTRL_MSM8960=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
+CONFIG_PINCTRL_SUNXI_COMMON=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I_A10S=y
+CONFIG_PINCTRL_SUN5I_A13=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31S=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN7I_A20=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN9I_A80=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -2964,6 +2996,7 @@ CONFIG_XILINX_WATCHDOG=m
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_CADENCE_WATCHDOG=m
 # CONFIG_DW_WATCHDOG is not set
+# CONFIG_SUNXI_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_IMX2_WDT is not set
 CONFIG_QCOM_WDT=m
@@ -3039,6 +3072,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SKY81452 is not set
 CONFIG_ABX500_CORE=y
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
@@ -3161,6 +3195,7 @@ CONFIG_IR_IGUANA=m
 # CONFIG_IR_TTUSBIR is not set
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_SUNXI is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -4192,6 +4227,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
 CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
 CONFIG_MMC_MTK=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
@@ -4364,6 +4400,8 @@ CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
+CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUNXI=m
 # CONFIG_RTC_DRV_MC13XXX is not set
 CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_MXC=m
@@ -4383,6 +4421,8 @@ CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 # CONFIG_AMBA_PL08X is not set
+CONFIG_DMA_SUN4I=m
+# CONFIG_DMA_SUN6I is not set
 # CONFIG_FSL_EDMA is not set
 CONFIG_IMX_DMA=m
 CONFIG_IMX_SDMA=m
@@ -4524,6 +4564,8 @@ CONFIG_COMMON_CLK_RK808=m
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_PROBE=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GLOBAL_TIMER=y
@@ -4562,7 +4604,7 @@ CONFIG_STE_MODEM_RPROC=m
 # CONFIG_SOC_BRCMSTB is not set
 CONFIG_QCOM_GSBI=m
 # CONFIG_QCOM_PM is not set
-# CONFIG_SUNXI_SRAM is not set
+CONFIG_SUNXI_SRAM=y
 CONFIG_SOC_TI=y
 CONFIG_PM_DEVFREQ=y
 
@@ -4596,6 +4638,7 @@ CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_IMX=m
 # CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_SUN4I=m
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 # CONFIG_IPACK_BUS is not set
@@ -4610,6 +4653,8 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_SUN4I_USB is not set
+CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_QCOM_UFS=m
@@ -5162,6 +5207,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_PCOMP=m
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=m
 # CONFIG_CRYPTO_RSA is not set
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
@@ -5291,6 +5337,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_LE=y
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_MXS_DCP=m
 CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_ASYMMETRIC_KEY_TYPE=m
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_PUBLIC_KEY_ALGO_RSA=m