From 8700846f393f4868cf1ab7a4b8874c9a378a69e0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 28 Sep 2016 19:29:48 -0300 Subject: linux-libre-lts: fix RCN patch --- ...sable-implicit-function-declaration-error.patch | 13 ---- ...0001-ARM-remove-spin_lock_and_spin_unlock.patch | 20 ------ libre/linux-libre-lts/PKGBUILD | 25 +++----- libre/linux-libre-lts/config.armv7h | 75 ++++------------------ 4 files changed, 20 insertions(+), 113 deletions(-) delete mode 100644 libre/linux-libre-lts/0001-ARM-disable-implicit-function-declaration-error.patch delete mode 100644 libre/linux-libre-lts/0001-ARM-remove-spin_lock_and_spin_unlock.patch diff --git a/libre/linux-libre-lts/0001-ARM-disable-implicit-function-declaration-error.patch b/libre/linux-libre-lts/0001-ARM-disable-implicit-function-declaration-error.patch deleted file mode 100644 index e02d20b01..000000000 --- a/libre/linux-libre-lts/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/libre/linux-libre-lts/0001-ARM-remove-spin_lock_and_spin_unlock.patch b/libre/linux-libre-lts/0001-ARM-remove-spin_lock_and_spin_unlock.patch deleted file mode 100644 index 7d8d971c4..000000000 --- a/libre/linux-libre-lts/0001-ARM-remove-spin_lock_and_spin_unlock.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c -index 0c88645..489d10a 100644 ---- a/drivers/i2c/busses/i2c-omap.c -+++ b/drivers/i2c/busses/i2c-omap.c -@@ -994,15 +994,12 @@ omap_i2c_isr(int irq, void *dev_id) - u16 mask; - u16 stat; - -- spin_lock(&omap->lock); - mask = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG); - stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG); - - if (stat & mask) - ret = IRQ_WAKE_THREAD; - -- spin_unlock(&omap->lock); -- - return ret; - } - diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fd1014254..fbf4b4591 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -20,7 +20,7 @@ _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} pkgrel=1 -rcnrel=armv7-x10 +rcnrel=armv7-x10.1 arch=('i686' 'x86_64' 'armv7h') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -49,8 +49,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # armv7h patches "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch" "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig" - '0001-ARM-remove-spin_lock_and_spin_unlock.patch' - '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' @@ -72,17 +70,15 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' 'f820ffd8c6a31e97b0086c914415d52644ab8ef6d3b23c03e2cbe8313d383376' '5bfc50836ec2dcb49497d156a03f24bb97bbaebb50514addceb1215efd4d6c78' - '294ba13ad6221c7d37f3270792aa470ac935c03cc1185e080f51fec9a56a5b07' + '56e7625e2da12bd78d5fcc53ff26e0ebce4f981e4fabab116a8e8259680881df' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' 'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798' '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8' '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4' - '87556459ae306d2e39acdce7e181690ce4d8736deea3c0aac529d0f7c7a284ad' + '737924886160c4f28b5198c59a2f2cd261df45417c1faf56b86e57b3f2509026' 'SKIP' - '73af660749be60c2b33ec85e06ffa840f538ca8fc169b96f245767436bdc36ee' - '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382' 'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817' '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4' '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08' @@ -117,18 +113,13 @@ prepare() { fi 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-${_pkgver%-*}-${rcnrel}.patch" - # fix RCN bugs - patch -p1 -i "${srcdir}/0001-ARM-remove-spin_lock_and_spin_unlock.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/libre/linux-libre-lts/config.armv7h b/libre/linux-libre-lts/config.armv7h index b60a34bf4..0dbed58b7 100644 --- a/libre/linux-libre-lts/config.armv7h +++ b/libre/linux-libre-lts/config.armv7h @@ -3084,7 +3084,6 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_EGALAX=m -# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set CONFIG_TOUCHSCREEN_FT6236=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m @@ -3097,7 +3096,6 @@ CONFIG_TOUCHSCREEN_WACOM_I2C=m CONFIG_TOUCHSCREEN_MAX11801=m CONFIG_TOUCHSCREEN_MCS5000=m CONFIG_TOUCHSCREEN_MMS114=m -# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_IMX6UL_TSC=m CONFIG_TOUCHSCREEN_INEXIO=m @@ -3134,19 +3132,14 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y CONFIG_TOUCHSCREEN_TOUCHIT213=m -# CONFIG_TOUCHSCREEN_TS4800 is not set CONFIG_TOUCHSCREEN_TSC_SERIO=m 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 @@ -3347,7 +3340,6 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_MUX_PINCTRL=y # CONFIG_I2C_MUX_REG is not set -# CONFIG_I2C_DEMUX_PINCTRL is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=y @@ -6280,7 +6272,9 @@ 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=m CONFIG_SCA3000=m @@ -6334,6 +6328,13 @@ CONFIG_SENSORS_ISL29028=m CONFIG_TSL2583=m CONFIG_TSL2x7x=m +# +# Magnetometer sensors +# +CONFIG_SENSORS_HMC5843=m +CONFIG_SENSORS_HMC5843_I2C=m +CONFIG_SENSORS_HMC5843_SPI=m + # # Active energy metering IC # @@ -6355,6 +6356,8 @@ CONFIG_AD2S1210=m # # Triggers - standalone # +# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set +# CONFIG_IIO_SIMPLE_DUMMY is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_XGI is not set @@ -6619,10 +6622,8 @@ CONFIG_IIO_BUFFER=y CONFIG_IIO_BUFFER_CB=m CONFIG_IIO_KFIFO_BUF=m CONFIG_IIO_TRIGGERED_BUFFER=m -CONFIG_IIO_CONFIGFS=m CONFIG_IIO_TRIGGER=y CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_TRIGGERED_EVENT=m # @@ -6638,15 +6639,11 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m CONFIG_KXSD9=m CONFIG_KXCJK1013=m -CONFIG_MMA7455=m -CONFIG_MMA7455_I2C=m -CONFIG_MMA7455_SPI=m CONFIG_MMA8452=m CONFIG_MMA9551_CORE=m CONFIG_MMA9551=m CONFIG_MMA9553=m CONFIG_MXC4005=m -CONFIG_MXC6255=m CONFIG_STK8312=m CONFIG_STK8BA50=m @@ -6667,20 +6664,14 @@ CONFIG_AXP288_ADC=m CONFIG_CC10001_ADC=m CONFIG_EXYNOS_ADC=m CONFIG_HI8435=m -CONFIG_INA2XX_ADC=m -CONFIG_IMX7D_ADC=m CONFIG_MAX1027=m CONFIG_MAX1363=m CONFIG_MCP320X=m CONFIG_MCP3422=m CONFIG_NAU7802=m -CONFIG_PALMAS_GPADC=m CONFIG_ROCKCHIP_SARADC=m CONFIG_TI_ADC081C=m -CONFIG_TI_ADC0832=m CONFIG_TI_ADC128S052=m -CONFIG_TI_ADS1015=m -CONFIG_TI_ADS8688=m CONFIG_TI_AM335X_ADC=m CONFIG_TWL4030_MADC=m CONFIG_TWL6030_GPADC=m @@ -6696,8 +6687,6 @@ CONFIG_AD8366=m # # Chemical Sensors # -CONFIG_ATLAS_PH_SENSOR=m -CONFIG_IAQCORE=m CONFIG_VZ89X=m # @@ -6725,13 +6714,10 @@ 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 CONFIG_AD5755=m -CONFIG_AD5761=m CONFIG_AD5764=m CONFIG_AD5791=m CONFIG_AD7303=m @@ -6740,12 +6726,6 @@ CONFIG_MAX517=m CONFIG_MAX5821=m CONFIG_MCP4725=m CONFIG_MCP4922=m -CONFIG_VF610_DAC=m - -# -# IIO dummy driver -# -# CONFIG_IIO_SIMPLE_DUMMY is not set # # Frequency Synthesizers DDS/PLL @@ -6778,21 +6758,9 @@ CONFIG_IIO_ST_GYRO_I2C_3AXIS=m CONFIG_IIO_ST_GYRO_SPI_3AXIS=m CONFIG_ITG3200=m -# -# Health Sensors -# - -# -# Heart Rate Monitors -# -CONFIG_AFE4403=m -CONFIG_AFE4404=m -CONFIG_MAX30100=m - # # Humidity sensors # -# CONFIG_AM2315 is not set CONFIG_DHT11=m CONFIG_HDC100X=m CONFIG_HTU21=m @@ -6804,12 +6772,8 @@ 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 -CONFIG_INV_MPU6050_SPI=m CONFIG_IIO_ADIS_LIB=m CONFIG_IIO_ADIS_LIB_BUFFER=y @@ -6821,7 +6785,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 @@ -6833,7 +6796,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 @@ -6843,24 +6805,19 @@ 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 CONFIG_IIO_ST_MAGN_3AXIS=m CONFIG_IIO_ST_MAGN_I2C_3AXIS=m CONFIG_IIO_ST_MAGN_SPI_3AXIS=m -CONFIG_SENSORS_HMC5843=m -CONFIG_SENSORS_HMC5843_I2C=m -CONFIG_SENSORS_HMC5843_SPI=m # # Inclinometer sensors @@ -6871,27 +6828,20 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m # # Triggers - standalone # -CONFIG_IIO_HRTIMER_TRIGGER=m CONFIG_IIO_INTERRUPT_TRIGGER=m CONFIG_IIO_SYSFS_TRIGGER=m # # Digital potentiometers # -# CONFIG_DS1803 is not set -# CONFIG_MCP4131 is not set CONFIG_MCP4531=m -CONFIG_TPL0102=m # # Pressure sensors # CONFIG_BMP280=m CONFIG_HID_SENSOR_PRESS=m -# CONFIG_HP03 is not set CONFIG_MPL115=m -CONFIG_MPL115_I2C=m -CONFIG_MPL115_SPI=m CONFIG_MPL3115=m CONFIG_MS5611=m CONFIG_MS5611_I2C=m @@ -6901,7 +6851,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