summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-01-16 17:31:01 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-01-16 17:32:28 -0300
commit5b3c5937763c21923d0617ed93a98490c83a3444 (patch)
tree1db063c4059cd9f32d1b9ae15954b89e08f0218f
parentd8ac1ce7a1263597c20a4c7f2d31accb0b599be6 (diff)
downloadabslibre-5b3c5937763c21923d0617ed93a98490c83a3444.tar.gz
abslibre-5b3c5937763c21923d0617ed93a98490c83a3444.tar.bz2
abslibre-5b3c5937763c21923d0617ed93a98490c83a3444.zip
linux-libre: minor fix
-rw-r--r--libre-testing/linux-libre/PKGBUILD8
-rw-r--r--libre-testing/linux-libre/config.i6862
-rw-r--r--libre-testing/linux-libre/config.x86_642
3 files changed, 4 insertions, 8 deletions
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
index 8af1870e2..2ff11bff6 100644
--- a/libre-testing/linux-libre/PKGBUILD
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -67,8 +67,8 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'SKIP'
'6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
'SKIP'
- 'd2c5e9ff600330c1adc0edfa272e1a657702c3a58b11a0a59d9327644627cb89'
- '972945b573e266db30449b39e8e83a7b4f783431f76a2de1c301d347d31b5d2d'
+ '12bab1b743a4ee7602ad355f1d4582799f38d125202cffeea1c395bece25776c'
+ 'd67f719de2d9b9cba751b0ad9e0d41f8ccf2dd301961c975b55edf740c34fd6c'
'8c5a492751701c13e79f3cbc4d1142664c089fb5bee9431cc1df669be45be222'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
@@ -137,10 +137,6 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix #46968
- # hangs on older intel hardware
- patch -Np1 -i "${srcdir}/0001-disabling-primary-plane-in-the-noatomic-case.patch"
-
# make the radeon driver load without the firmwares
# http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html
if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then ## This patch is only needed for x86 computers, so we disable it for others
diff --git a/libre-testing/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686
index 92ab6ce8c..6925e7fcd 100644
--- a/libre-testing/linux-libre/config.i686
+++ b/libre-testing/linux-libre/config.i686
@@ -450,7 +450,7 @@ CONFIG_X86_ESPFIX32=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
# CONFIG_MICROCODE_INTEL is not set
# CONFIG_MICROCODE_AMD is not set
CONFIG_MICROCODE_OLD_INTERFACE=y
diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64
index 0478b23a6..a5e2749c3 100644
--- a/libre-testing/linux-libre/config.x86_64
+++ b/libre-testing/linux-libre/config.x86_64
@@ -448,7 +448,7 @@ CONFIG_X86_16BIT=y
CONFIG_X86_ESPFIX64=y
CONFIG_X86_VSYSCALL_EMULATION=y
CONFIG_I8K=m
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
# CONFIG_MICROCODE_INTEL is not set
# CONFIG_MICROCODE_AMD is not set
CONFIG_MICROCODE_OLD_INTERFACE=y