diff mbox series

[5/5] UBUNTU: [Config] azure: arm64: Enable SQUASHFS config options

Message ID 20220412172014.13127-6-tim.gardner@canonical.com
State New
Headers show
Series Enable missing config options | expand

Commit Message

Tim Gardner April 12, 2022, 5:20 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1968749

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.azure/config/amd64/config.common.amd64 | 7 -------
 debian.azure/config/arm64/config.common.arm64 | 7 -------
 debian.azure/config/config.common.ubuntu      | 7 +++++++
 3 files changed, 7 insertions(+), 14 deletions(-)
diff mbox series

Patch

diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
index f289dffa93771..66705626fea26 100644
--- a/debian.azure/config/amd64/config.common.amd64
+++ b/debian.azure/config/amd64/config.common.amd64
@@ -1383,12 +1383,6 @@  CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
 CONFIG_SPI_ZYNQMP_GQSPI=m
 # CONFIG_SPMI is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SSB=m
 CONFIG_STACK_TRACER=y
 CONFIG_STAGING_GASKET_FRAMEWORK=m
@@ -1502,4 +1496,3 @@  CONFIG_ZBUD=y
 CONFIG_ZIIRAVE_WATCHDOG=m
 CONFIG_ZPOOL=y
 CONFIG_ZSMALLOC=y
-CONFIG_ZSTD_DECOMPRESS=y
diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
index b938974196df1..c8b0cb1a5061f 100644
--- a/debian.azure/config/arm64/config.common.arm64
+++ b/debian.azure/config/arm64/config.common.arm64
@@ -1383,12 +1383,6 @@  CONFIG_SPI_ROCKCHIP=y
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 CONFIG_SPMI=y
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-# CONFIG_SQUASHFS_LZ4 is not set
-# CONFIG_SQUASHFS_LZO is not set
-# CONFIG_SQUASHFS_XATTR is not set
-# CONFIG_SQUASHFS_ZSTD is not set
 # CONFIG_SSB is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_STAGING_GASKET_FRAMEWORK is not set
@@ -1502,4 +1496,3 @@  CONFIG_XEN=y
 # CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_ZPOOL is not set
 # CONFIG_ZSMALLOC is not set
-CONFIG_ZSTD_DECOMPRESS=m
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index f2ecafc16d457..24ad05485aef1 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -5791,9 +5791,15 @@  CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
 CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_ZSTD=y
 CONFIG_SRAM=y
 CONFIG_SRCU=y
 # CONFIG_SRF04 is not set
@@ -7021,6 +7027,7 @@  CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_ZSWAP=y
 CONFIG_ZYNQMP_FIRMWARE=y
 # CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set