From 44653089900df36502a4fee5cee83400d840d622 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 27 Sep 2016 14:53:17 -0300 Subject: linux-libre-rt: fix RCN patch --- ...sable-implicit-function-declaration-error.patch | 13 ---------- kernels/linux-libre-rt/PKGBUILD | 20 ++++++--------- kernels/linux-libre-rt/config.armv7h | 29 +++++----------------- 3 files changed, 14 insertions(+), 48 deletions(-) delete mode 100644 kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch diff --git a/kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch b/kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch deleted file mode 100644 index e02d20b01..000000000 --- a/kernels/linux-libre-rt/0001-ARM-disable-implicit-function-declaration-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index b03f266..f3fadc9 100644 ---- a/Makefile -+++ b/Makefile -@@ -391,7 +391,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__ - - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ -- -Werror-implicit-function-declaration \ -+ -Wno-implicit-function-declaration \ - -Wno-format-security \ - -std=gnu89 - diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 64ca0d2e2..244537cc2 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -22,7 +22,7 @@ _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*}_${_rtpatchver} pkgver=${_pkgver//-/_}.${_rtpatchver} pkgrel=1 -rcnrel=armv7-x5 +rcnrel=armv7-x5.1 arch=('i686' 'x86_64' 'armv7h') url="https://rt.wiki.kernel.org/" license=('GPL2') @@ -51,7 +51,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # armv7h patches "https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch" "https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch.sig" - '0001-ARM-disable-implicit-function-declaration-error.patch' '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' '0003-SMILE-Plug-device-tree-file.patch' @@ -74,14 +73,13 @@ sha256sums=('c3726ad785b2f4534c78a2cff1dd09906dde8b82775e55860a6091b16bf62ef8' 'SKIP' 'f82fc9e36dccff9bc761f3d4801ca78c8da08d269acdabc62b0c5c7b01356886' '55aa06cb017dbbeb13b1da1bb124c479aadfa60b40957f25579a1a84db94f791' - '45930d28f4e63cee7197919eae0ffc8bd88a3b658c920dd4066d984e26c7a13f' + '63ea9e8933f90bbaa96a2a341b2f20a0d0ea38d5ca08894b222daa80957d4e5a' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' - 'c23e4baa0acdcf3070b900a3d5fe83a4d358246ffb4b9be61355c255deeae763' + '03efd78095d1c76ed64a8e723f8ce969f197d655d68808dee2d1cd6e8ecdeb1b' 'SKIP' - '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382' '9fc2533ed95497583752c6eca931f24c159be956fcc49d39cac64da7298a9c88' '909c046f6123ec81764fde5d9a78431a9dc3b206ce01119ae4d91be54d9471dd' '11c63a0952293b4fee080c2c0faf8b08283282c0a50694e71cab0c2503478ac5' @@ -122,15 +120,13 @@ prepare() { rm localversion-rt if [ "${CARCH}" = "armv7h" ]; then - # RCN patch (CM3 firmware deblobbed, AUFS and RT removed) - # Note: For stability reasons, AUFS and RT have been removed in the RCN patch. - # We are supporting AUFS in linux-libre-pck through PCK patch and RT through its official - # patch in linux-libre-rt. See https://wiki.parabola.nu/PCK for further details about PCK. + # RCN patch (CM3 firmware deblobbed, I2C/IIO/touchscreen backports, AUFS and RT removed) + # Note: For stability reasons, I2C/IIO/touchscreen backports, AUFS and RT have been + # removed in the RCN patch. We are supporting AUFS in linux-libre-pck through PCK patch + # and RT through its official patch in linux-libre-rt. See https://wiki.parabola.nu/PCK + # for further details about PCK. git apply -v "${srcdir}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch" - # disable implicit function declaration error since there are old backports patches - patch -p1 -i "${srcdir}/0001-ARM-disable-implicit-function-declaration-error.patch" - # ALARM patches patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch" patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch" diff --git a/kernels/linux-libre-rt/config.armv7h b/kernels/linux-libre-rt/config.armv7h index cb9975142..7766c895b 100644 --- a/kernels/linux-libre-rt/config.armv7h +++ b/kernels/linux-libre-rt/config.armv7h @@ -3259,13 +3259,9 @@ CONFIG_TOUCHSCREEN_TSC200X_CORE=m CONFIG_TOUCHSCREEN_TSC2004=m CONFIG_TOUCHSCREEN_TSC2005=m CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_RM_TS is not set -# CONFIG_TOUCHSCREEN_SILEAD is not set -# CONFIG_TOUCHSCREEN_SIS_I2C is not set CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_SUN4I=m # CONFIG_TOUCHSCREEN_SUR40 is not set -# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set CONFIG_TOUCHSCREEN_SX8654=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_TOUCHSCREEN_ZFORCE=m @@ -6476,8 +6472,11 @@ CONFIG_8723AU_BT_COEXIST=y # CONFIG_ADIS16201=m CONFIG_ADIS16203=m +# CONFIG_ADIS16204 is not set CONFIG_ADIS16209=m +# CONFIG_ADIS16220 is not set CONFIG_ADIS16240=m +# CONFIG_LIS3L02DQ is not set CONFIG_SCA3000=m # @@ -6827,7 +6826,6 @@ CONFIG_IIO_TRIGGERED_BUFFER=m CONFIG_IIO_CONFIGFS=m CONFIG_IIO_TRIGGER=y CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -# CONFIG_IIO_SW_DEVICE is not set CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_TRIGGERED_EVENT=m @@ -6835,7 +6833,6 @@ CONFIG_IIO_TRIGGERED_EVENT=m # Accelerometers # CONFIG_BMA180=m -# CONFIG_BMA220 is not set CONFIG_BMC150_ACCEL=m CONFIG_BMC150_ACCEL_I2C=m CONFIG_BMC150_ACCEL_SPI=m @@ -6848,7 +6845,6 @@ CONFIG_KXCJK1013=m CONFIG_MMA7455=m CONFIG_MMA7455_I2C=m CONFIG_MMA7455_SPI=m -# CONFIG_MMA7660 is not set CONFIG_MMA8452=m CONFIG_MMA9551_CORE=m CONFIG_MMA9551=m @@ -6933,8 +6929,6 @@ CONFIG_AD5380=m CONFIG_AD5421=m CONFIG_AD5446=m CONFIG_AD5449=m -# CONFIG_AD5592R is not set -# CONFIG_AD5593R is not set CONFIG_AD5504=m CONFIG_AD5624R_SPI=m CONFIG_AD5686=m @@ -6953,6 +6947,7 @@ CONFIG_VF610_DAC=m # # IIO dummy driver # +# CONFIG_IIO_SIMPLE_DUMMY is not set # # Frequency Synthesizers DDS/PLL @@ -6999,7 +6994,6 @@ CONFIG_MAX30100=m # # Humidity sensors # -# CONFIG_AM2315 is not set CONFIG_DHT11=m CONFIG_HDC100X=m CONFIG_HTU21=m @@ -7011,8 +7005,6 @@ CONFIG_SI7020=m # CONFIG_ADIS16400=m CONFIG_ADIS16480=m -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set CONFIG_KMX61=m CONFIG_INV_MPU6050_IIO=m CONFIG_INV_MPU6050_I2C=m @@ -7028,7 +7020,6 @@ CONFIG_AL3320A=m CONFIG_APDS9300=m CONFIG_APDS9960=m CONFIG_BH1750=m -# CONFIG_BH1780 is not set CONFIG_CM32181=m CONFIG_CM3232=m CONFIG_CM3323=m @@ -7040,7 +7031,6 @@ CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m CONFIG_RPR0521=m CONFIG_LTR501=m -# CONFIG_MAX44000 is not set CONFIG_OPT3001=m CONFIG_PA12203001=m CONFIG_STK3310=m @@ -7050,15 +7040,13 @@ CONFIG_SENSORS_TSL2563=m CONFIG_TSL4531=m CONFIG_US5182D=m CONFIG_VCNL4000=m -# CONFIG_VEML6070 is not set # # Magnetometer sensors # CONFIG_AK8975=m CONFIG_AK09911=m -# CONFIG_BMC150_MAGN_I2C is not set -# CONFIG_BMC150_MAGN_SPI is not set +# CONFIG_BMC150_MAGN is not set CONFIG_MAG3110=m CONFIG_HID_SENSOR_MAGNETOMETER_3D=m CONFIG_MMC35240=m @@ -7080,23 +7068,19 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m # CONFIG_IIO_HRTIMER_TRIGGER=m CONFIG_IIO_INTERRUPT_TRIGGER=m -# CONFIG_IIO_TIGHTLOOP_TRIGGER is not set CONFIG_IIO_SYSFS_TRIGGER=m # # Digital potentiometers # -# CONFIG_DS1803 is not set -# CONFIG_MAX5487 is not set -# CONFIG_MCP4131 is not set CONFIG_MCP4531=m CONFIG_TPL0102=m # # Pressure sensors # +# CONFIG_BMP280 is not set CONFIG_HID_SENSOR_PRESS=m -# CONFIG_HP03 is not set CONFIG_MPL115=m CONFIG_MPL115_I2C=m CONFIG_MPL115_SPI=m @@ -7109,7 +7093,6 @@ CONFIG_IIO_ST_PRESS=m CONFIG_IIO_ST_PRESS_I2C=m CONFIG_IIO_ST_PRESS_SPI=m CONFIG_T5403=m -# CONFIG_HP206C is not set # # Lightning sensors -- cgit v1.2.3