From aa2df1a52173035d6f6e4400d29e453dc22182dc Mon Sep 17 00:00:00 2001
From: Mohammad Afaneh <mohammad.afaneh92@gmail.com>
Date: Sat, 14 Nov 2020 16:22:35 +0200
Subject: [PATCH] sm8250: Switch to gzip kernel compression

---
 arch/arm64/configs/vendor/afaneh_c1q_defconfig |  4 ++--
 arch/arm64/configs/vendor/afaneh_c2q_defconfig |  4 ++--
 arch/arm64/configs/vendor/afaneh_x1q_defconfig |  4 ++--
 arch/arm64/configs/vendor/afaneh_y2q_defconfig |  4 ++--
 arch/arm64/configs/vendor/afaneh_z3q_defconfig |  4 ++--
 build_menu                                     | 14 +++++++-------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/configs/vendor/afaneh_c1q_defconfig b/arch/arm64/configs/vendor/afaneh_c1q_defconfig
index 5c1cfcd3474c..deb100e24b88 100755
--- a/arch/arm64/configs/vendor/afaneh_c1q_defconfig
+++ b/arch/arm64/configs/vendor/afaneh_c1q_defconfig
@@ -502,8 +502,8 @@ CONFIG_IMG_GZ_DTB=y
 # CONFIG_IMG_DTB is not set
 CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME="Image.gz-dtb"
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES=""
-# CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP is not set
-CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y
+CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y
+# CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL is not set
 CONFIG_KRYO_PMU_WORKAROUND=y
 CONFIG_BUILD_ARM64_DT_OVERLAY=y
 CONFIG_COMPAT=y
diff --git a/arch/arm64/configs/vendor/afaneh_c2q_defconfig b/arch/arm64/configs/vendor/afaneh_c2q_defconfig
index 1dfd786ff931..c1eb399d44d2 100755
--- a/arch/arm64/configs/vendor/afaneh_c2q_defconfig
+++ b/arch/arm64/configs/vendor/afaneh_c2q_defconfig
@@ -502,8 +502,8 @@ CONFIG_IMG_GZ_DTB=y
 # CONFIG_IMG_DTB is not set
 CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME="Image.gz-dtb"
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES=""
-# CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP is not set
-CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y
+CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y
+# CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL is not set
 CONFIG_KRYO_PMU_WORKAROUND=y
 CONFIG_BUILD_ARM64_DT_OVERLAY=y
 CONFIG_COMPAT=y
diff --git a/arch/arm64/configs/vendor/afaneh_x1q_defconfig b/arch/arm64/configs/vendor/afaneh_x1q_defconfig
index 6baffcc55b9f..7d4bbd32e238 100755
--- a/arch/arm64/configs/vendor/afaneh_x1q_defconfig
+++ b/arch/arm64/configs/vendor/afaneh_x1q_defconfig
@@ -499,8 +499,8 @@ CONFIG_IMG_GZ_DTB=y
 # CONFIG_IMG_DTB is not set
 CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME="Image.gz-dtb"
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES=""
-# CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP is not set
-CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y
+CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y
+# CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL is not set
 CONFIG_KRYO_PMU_WORKAROUND=y
 CONFIG_BUILD_ARM64_DT_OVERLAY=y
 CONFIG_COMPAT=y
diff --git a/arch/arm64/configs/vendor/afaneh_y2q_defconfig b/arch/arm64/configs/vendor/afaneh_y2q_defconfig
index ac6e2bf2fbe3..c0a160d0f3d3 100755
--- a/arch/arm64/configs/vendor/afaneh_y2q_defconfig
+++ b/arch/arm64/configs/vendor/afaneh_y2q_defconfig
@@ -500,8 +500,8 @@ CONFIG_IMG_GZ_DTB=y
 # CONFIG_IMG_DTB is not set
 CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME="Image.gz-dtb"
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES=""
-# CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP is not set
-CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y
+CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y
+# CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL is not set
 CONFIG_KRYO_PMU_WORKAROUND=y
 CONFIG_BUILD_ARM64_DT_OVERLAY=y
 CONFIG_COMPAT=y
diff --git a/arch/arm64/configs/vendor/afaneh_z3q_defconfig b/arch/arm64/configs/vendor/afaneh_z3q_defconfig
index 485ce012571e..9a8b4b43b09d 100755
--- a/arch/arm64/configs/vendor/afaneh_z3q_defconfig
+++ b/arch/arm64/configs/vendor/afaneh_z3q_defconfig
@@ -499,8 +499,8 @@ CONFIG_IMG_GZ_DTB=y
 # CONFIG_IMG_DTB is not set
 CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME="Image.gz-dtb"
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES=""
-# CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP is not set
-CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y
+CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y
+# CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL is not set
 CONFIG_KRYO_PMU_WORKAROUND=y
 CONFIG_BUILD_ARM64_DT_OVERLAY=y
 CONFIG_COMPAT=y
diff --git a/build_menu b/build_menu
index ceaaf49d996e..e0e3c9615658 100755
--- a/build_menu
+++ b/build_menu
@@ -83,9 +83,9 @@ build(){
   make -j$(nproc) -C $(pwd) O=$(pwd)/out $KERNEL_MAKE_ENV ARCH=arm64 CROSS_COMPILE=$BUILD_CROSS_COMPILE REAL_CC=$KERNEL_LLVM_BIN CLANG_TRIPLE=$CLANG_TRIPLE CFP_CC=$KERNEL_LLVM_BIN vendor/afaneh_${VARIANT}_defconfig
   make -j$(nproc) -C $(pwd) O=$(pwd)/out $KERNEL_MAKE_ENV ARCH=arm64 CROSS_COMPILE=$BUILD_CROSS_COMPILE REAL_CC=$KERNEL_LLVM_BIN CLANG_TRIPLE=$CLANG_TRIPLE CFP_CC=$KERNEL_LLVM_BIN
 
-  [ -e out/arch/arm64/boot/Image ] && cp out/arch/arm64/boot/Image $(pwd)/out/Image
-  if [ -e out/arch/arm64/boot/Image-dtb ]; then
-    cp out/arch/arm64/boot/Image-dtb $(pwd)/out/Image-dtb
+  [ -e out/arch/arm64/boot/Image.gz ] && cp out/arch/arm64/boot/Image.gz $(pwd)/out/Image.gz
+  if [ -e out/arch/arm64/boot/Image.gz-dtb ]; then
+    cp out/arch/arm64/boot/Image.gz-dtb $(pwd)/out/Image.gz-dtb
 
     DTBO_FILES=$(find ${DTS_DIR}/samsung/ -name ${CHIPSET_NAME}-sec-${VARIANT}-*-r*.dtbo)
     cat ${DTS_DIR}/vendor/qcom/*.dtb > $(pwd)/out/dtb.img
@@ -104,10 +104,10 @@ anykernel3(){
   fi
   variant
   [ -e $PARENT_DIR/${VARIANT}_kernel.zip ] && rm $PARENT_DIR/${VARIANT}_kernel.zip
-  if [ -e out/arch/arm64/boot/Image-dtb ]; then
-    cp out/arch/arm64/boot/Image-dtb $PARENT_DIR/AnyKernel3/zImage
-  elif [ -e out/arch/arm64/boot/Image ]; then
-    cp out/arch/arm64/boot/Image $PARENT_DIR/AnyKernel3/zImage
+  if [ -e out/arch/arm64/boot/Image.gz-dtb ]; then
+    cp out/arch/arm64/boot/Image.gz-dtb $PARENT_DIR/AnyKernel3/zImage
+  elif [ -e out/arch/arm64/boot/Image.gz ]; then
+    cp out/arch/arm64/boot/Image.gz $PARENT_DIR/AnyKernel3/zImage
   else
     pause 'return to Main menu' 'Build kernel first, '
   fi