diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index 60628b674..004b7b8a4 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -4,8 +4,8 @@ buildarch=4 _rcver=3.19 -_rcrel=2 -_rcnrel=armv7-x0 +_rcrel=3 +_rcnrel=armv7-x1 pkgbase=linux-armv7-rc _srcname=linux-3.$((${_rcver##*.}-1)) @@ -28,14 +28,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" '0004-fix-mvsdio-eMMC-timing.patch' 'config') md5sums=('9e854df51ca3fef8bfe566dbd7b89241' - '1c6974f39129582c2d5a8755b1fc7369' - '5d8e0363bbba8f8bbb7623cc5e4eb139' + '63cb0c21a591edafb1032bdc689c9193' + '5c5bb144c5a0231e90e438d3e3a5b646' 'SKIP' '70b9ce2701ad3f43940d0172e4618549' 'af7f56bc5712f264a55bb6603e64df0e' 'a70066db5aa59f660dd7e31809b47e4c' 'a27e0ba6c63e0656039e20eeb957fee1' - '973b2983e619dd22879c1d53c175ff69') + '2f9f347258ae9a99c6353a4558ce5646') prepare() { cd "${srcdir}/${_srcname}" @@ -274,8 +274,8 @@ _package-headers() { _package-smileplug() { pkgdesc="The Linux Kernel - ${_desc} - Marvell SMILE Plug" depends=('linux-armv7-rc') - conflicts=('linux-armv7-rc-mirabox' 'linux-armv7-rc-ax3' 'linux-armv7-rc-d3plug') - replaces=('linux-mvebu-smileplug') + provides=('linux-armv7-rc-uimage') + conflicts=('linux-armv7-rc-uimage') cd "${srcdir}/${_srcname}" @@ -287,8 +287,8 @@ _package-smileplug() { _package-mirabox() { pkgdesc="The Linux Kernel - ${_desc} - Globalscale Mirabox" depends=('linux-armv7-rc') - conflicts=('linux-armv7-rc-smileplug' 'linux-armv7-rc-ax3' 'linux-armv7-rc-d3plug') - replaces=('linux-mvebu-mirabox') + provides=('linux-armv7-rc-uimage') + conflicts=('linux-armv7-rc-uimage') cd "${srcdir}/${_srcname}" @@ -300,8 +300,8 @@ _package-mirabox() { _package-ax3() { pkgdesc="The Linux Kernel - ${_desc} - OpenBlocks AX3-4" depends=('linux-armv7-rc') - conflicts=('linux-armv7-rc-mirabox' 'linux-armv7-rc-smileplug' 'linux-armv7-rc-d3plug') - replaces=('linux-mvebu-ax3') + provides=('linux-armv7-rc-uimage') + conflicts=('linux-armv7-rc-uimage') cd "${srcdir}/${_srcname}" @@ -313,7 +313,8 @@ _package-ax3() { _package-d3plug() { pkgdesc="The Linux Kernel - ${_desc} - Globalscale D3Plug" depends=('linux-armv7-rc') - conflicts=('linux-armv7-rc-mirabox' 'linux-armv7-rc-smileplug' 'linux-armv7-rc-ax3') + provides=('linux-armv7-rc-uimage') + conflicts=('linux-armv7-rc-uimage') cd "${srcdir}/${_srcname}" diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config index 0f919ccf3..75cb4b44f 100644 --- a/core/linux-armv7-rc/config +++ b/core/linux-armv7-rc/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.19.0-rc1-1 Kernel Configuration +# Linux/arm 3.19.0-rc3-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1566,6 +1566,7 @@ CONFIG_NL80211_TESTMODE=y CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set CONFIG_CFG80211_INTERNAL_REGDB=y +# CONFIG_CFG80211_WEXT is not set CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m @@ -1923,6 +1924,11 @@ CONFIG_ALTERA_STAPL=m # # Intel MIC Card Driver # + +# +# Argus cape driver for beaglebone black +# +CONFIG_CAPE_BONE_ARGUS=m # CONFIG_ECHO is not set # CONFIG_CXL_BASE is not set CONFIG_HAVE_IDE=y @@ -2518,6 +2524,7 @@ CONFIG_HOSTAP_PCI=m CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set +# CONFIG_IPW2200 is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m @@ -2911,7 +2918,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_EM is not set -# CONFIG_SERIAL_8250_OMAP is not set +CONFIG_SERIAL_8250_OMAP=y +CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y # # Non-8250 serial port support @@ -2940,8 +2948,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_CONSOLE_POLL=y # CONFIG_SERIAL_JSM is not set CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_OMAP is not set # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SC16IS7XX is not set # CONFIG_SERIAL_BCM63XX is not set @@ -3399,7 +3406,7 @@ CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m CONFIG_SENSORS_G762=m -CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_IIO_HWMON=m CONFIG_SENSORS_IT87=m @@ -4505,7 +4512,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_HX8357 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_PWM=y # CONFIG_BACKLIGHT_DA9052 is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set