diff options
author | John Crispin <blogic@openwrt.org> | 2014-12-11 20:41:51 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2014-12-11 20:41:51 +0000 |
commit | 28633a32eb290ac6e1e77db8d2bdf587ed38caf6 (patch) | |
tree | a4b5b8a44c022655a29da612676772bc572d60f2 /target/linux | |
parent | cdcba724ce9315cc5522f69de7d92e98a68bd9f2 (diff) | |
download | upstream-28633a32eb290ac6e1e77db8d2bdf587ed38caf6.tar.gz upstream-28633a32eb290ac6e1e77db8d2bdf587ed38caf6.tar.bz2 upstream-28633a32eb290ac6e1e77db8d2bdf587ed38caf6.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43640 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/oxnas/config-3.14 | 2 |
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 |