| Message ID | 20141211203834.GA19695@makrotopia.org |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/target/linux/oxnas/config-3.14 b/target/linux/oxnas/config-3.14 index 727d81e..086f870 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
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> --- target/linux/oxnas/config-3.14 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)