summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/linux-libre-lts/0001-ARM-disable-implicit-function-declaration-error.patch13
-rw-r--r--libre/linux-libre-lts/0001-ARM-remove-spin_lock_and_spin_unlock.patch20
-rw-r--r--libre/linux-libre-lts/PKGBUILD18
-rw-r--r--libre/linux-libre-lts/config.armv7h18
4 files changed, 52 insertions, 17 deletions
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
new file mode 100644
index 000000000..e02d20b01
--- /dev/null
+++ b/libre/linux-libre-lts/0001-ARM-disable-implicit-function-declaration-error.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000..7d8d971c4
--- /dev/null
+++ b/libre/linux-libre-lts/0001-ARM-remove-spin_lock_and_spin_unlock.patch
@@ -0,0 +1,20 @@
+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 b06a40101..8830deec9 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -10,7 +10,7 @@
pkgbase=linux-libre-lts
_pkgbasever=4.4-gnu
-_pkgver=4.4.20-gnu
+_pkgver=4.4.21-gnu
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -49,6 +49,8 @@ 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'
@@ -60,7 +62,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'0009-ARM-dts-dove-add-Dove-divider-clocks.patch')
sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
- 'e193c7bcc95470d2bd13e6ec97a5df254bf96861d0c5d0ad1cfd02ddd82e2273'
+ '2897fc1d2078ee490366cfd9a08076f8e489ce0d590df2f727caee5f262830f9'
'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
@@ -70,15 +72,17 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
'f820ffd8c6a31e97b0086c914415d52644ab8ef6d3b23c03e2cbe8313d383376'
'5bfc50836ec2dcb49497d156a03f24bb97bbaebb50514addceb1215efd4d6c78'
- '4c5ed593868237319524b5df11235ed3dcfe74bf8408f653cb5d6a342bc6dbf8'
+ '95e3bc0ef37404867472a9270e5810e75f86a717e66d4dfd60ecc9527d593205'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798'
'96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
'2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
- '68f710e811af2ac0f67cccd061e356c6919d91fecff57e8ac5aab9d96271f83d'
+ '87556459ae306d2e39acdce7e181690ce4d8736deea3c0aac529d0f7c7a284ad'
'SKIP'
+ '73af660749be60c2b33ec85e06ffa840f538ca8fc169b96f245767436bdc36ee'
+ '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
'486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
'6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -119,6 +123,12 @@ prepare() {
# 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 5d0bf8cbb..da722547d 100644
--- a/libre/linux-libre-lts/config.armv7h
+++ b/libre/linux-libre-lts/config.armv7h
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.20-gnu-1-lts Kernel Configuration
+# Linux/arm 4.4.21-gnu-1-lts Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -684,14 +684,11 @@ CONFIG_NR_CPUS=8
CONFIG_HOTPLUG_CPU=y
CONFIG_ARM_PSCI=y
CONFIG_ARCH_NR_GPIO=1024
-CONFIG_HAVE_PREEMPT_LAZY=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT__LL is not set
-# CONFIG_PREEMPT_RTB is not set
-# CONFIG_PREEMPT_RT_FULL is not set
-CONFIG_HZ_FIXED=200
-CONFIG_HZ=200
+# CONFIG_PREEMPT is not set
+CONFIG_HZ_FIXED=100
+CONFIG_HZ=100
CONFIG_SCHED_HRTICK=y
# CONFIG_THUMB2_KERNEL is not set
CONFIG_AEABI=y
@@ -1962,7 +1959,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
# CONFIG_DUMMY_IRQ is not set
-CONFIG_HWLAT_DETECTOR=m
# CONFIG_PHANTOM is not set
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
@@ -3070,9 +3066,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_PROPERTIES=y
CONFIG_TOUCHSCREEN_ADS7846=m
CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
+# CONFIG_TOUCHSCREEN_AD7879 is not set
CONFIG_TOUCHSCREEN_AR1021_I2C=m
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
@@ -7190,7 +7184,6 @@ CONFIG_UFS_FS=m
# CONFIG_UFS_DEBUG is not set
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_DEBUG is not set
-# CONFIG_AUFS_FS is not set
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
@@ -7426,7 +7419,6 @@ CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
-# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
CONFIG_FTRACE_SYSCALLS=y
# CONFIG_TRACER_SNAPSHOT is not set
CONFIG_BRANCH_PROFILE_NONE=y