diff mbox

[SRU,Mako,Wily,Vivid] Enable squashfs support

Message ID 563A78B8.7030704@canonical.com
State New
Headers show

Commit Message

Kyle Fazzari Nov. 4, 2015, 9:29 p.m. UTC 
From cbef2bd7babf6a9b56e84661983a5638f3423743 Mon Sep 17 00:00:00 2001
From: Kyle Fazzari <kyle@canonical.com>
Date: Wed, 4 Nov 2015 17:24:22 +0000
Subject: UBUNTU: SAUCE: Enable squashfs for mako.

BugLink: https://bugs.launchpad.net/bugs/1513207

These config changes were copied from the trusty kernel, though
BCJ filter decoding was only enabled for ARM.

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
---
 debian.mako/config/config.common.ubuntu | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

Comments

Tim Gardner Nov. 6, 2015, 8:06 p.m. UTC | #1
diff mbox

Patch

diff --git a/debian.mako/config/config.common.ubuntu b/debian.mako/config/config.common.ubuntu
index 0fced42..7157a05 100644
--- a/debian.mako/config/config.common.ubuntu
+++ b/debian.mako/config/config.common.ubuntu
@@ -550,6 +550,7 @@  CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DECNET is not set
 CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_XZ=y
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -2465,7 +2466,19 @@  CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SPS=y
 CONFIG_SPS_SUPPORT_BAMDMA=y
 # CONFIG_SPS_SUPPORT_NDP_BAM is not set
-# CONFIG_SQUASHFS is not set
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SSB is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_STACKTRACE=y
@@ -2943,8 +2956,15 @@  CONFIG_XFRM_USER=m
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_XPS=y
-# CONFIG_XZ_DEC is not set
-# CONFIG_XZ_DEC_BCJ is not set
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=n
+CONFIG_XZ_DEC_POWERPC=n
+CONFIG_XZ_DEC_IA64=n
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=n
+CONFIG_XZ_DEC_BCJ=n
+CONFIG_XZ_DEC_TEST=n
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZLIB_DEFLATE=y