From dca6cce103a1dd7b62d41391b5b8b45c99fb8485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Wed, 9 Sep 2015 22:06:23 -0300
Subject: linux-libre{,-dtb}: update config.armv7h

---
 libre/linux-libre/PKGBUILD      | 2 +-
 libre/linux-libre/config.armv7h | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'libre/linux-libre')

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index ebf83de26..7d192e4a0 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -69,7 +69,7 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324'
             'SKIP'
             '7ec6927f4a4bc8e1aa50adfcce868f04b07b0de19a54554a8ad27ee0341b4b45'
             'ac457bf24c83a4af82251a67cb3de06f0b73e66bd08c2fb1eb936caa3b555c6f'
-            'ba2bc52b7be477c362af2b5267ec07efdf2ba5afee4a07ac0df1dd47720d90e5'
+            'bddc6542d1a68330e867efca6657cc57e9eeb8f83ec86e5580dc1b6c89332f13'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d'
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index c22750444..b07881c19 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -10,7 +10,6 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
-CONFIG_ARCH_DEFCONFIG="arch/arm/configs/rcn-ee_defconfig"
 CONFIG_NO_IOPORT_MAP=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
@@ -39,15 +38,13 @@ CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -1929,6 +1926,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
+# CONFIG_EEPROM_SUNXI_SID is not set
 # CONFIG_CB710_CORE is not set
 
 #
-- 
cgit v1.2.3-2-g168b