aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-11 20:41:51 +0000
committerJohn Crispin <john@openwrt.org>2014-12-11 20:41:51 +0000
commitad35bcc41e54a3444c3901eec86f255d3841b941 (patch)
treee373fc9ac4a61f7284097c0db1c90cd86439f22e
parent3aaee1ba023ac40f329821ca3d2fb6b17a7532a4 (diff)
downloadupstream-ad35bcc41e54a3444c3901eec86f255d3841b941.tar.gz
upstream-ad35bcc41e54a3444c3901eec86f255d3841b941.tar.bz2
upstream-ad35bcc41e54a3444c3901eec86f255d3841b941.zip
oxnas: use ARM BCJ filter for XZ decompression
Restoring the config for kernel 3.14 didn't contain that change already made to config-3.18. It is needed to make squashfs in the kernel match the compression settings for ARCH=arm in the framework. If set to ARMTHUMB, boot fails due to squashfs being unreadable if the filesystem was generated for wth ARM BCJ filter. in include/image.mk: BCJ_FILTER:=-Xbcj $(LINUX_KARCH) Thus the ARM filter is used for all ARM targets. Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 43640
-rw-r--r--target/linux/oxnas/config-3.142
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/oxnas/config-3.14 b/target/linux/oxnas/config-3.14
index 727d81e2f4..086f870cea 100644
--- a/target/linux/oxnas/config-3.14
+++ b/target/linux/oxnas/config-3.14
@@ -339,7 +339,7 @@ CONFIG_VM_EVENT_COUNTERS=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_XPS=y
-CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_BCJ=y
CONFIG_ZBOOT_ROM_BSS=0
CONFIG_ZBOOT_ROM_TEXT=0