From a4fdfa09ce6056556f42be0f8b19a3fe4ed05871 Mon Sep 17 00:00:00 2001
From: Roger Shimizu <rogershimizu@gmail.com>
Date: Sat, 7 Apr 2018 19:53:33 +0900
Subject: [PATCH] [armel] Change size limit of armel kernel image back to
 2097080

Reduce armel image size by:
- Set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
- Change MTD, MTD_CMDLINE_PARTS, RTC_DRV_MV, and SPI_ORION from
  built-in to module.
- Disable VT, ZSWAP, RD_BZIP2, and RD_LZMA.

So qnap support is back.

Thanks to Leigh Brown <leigh@solinno.co.uk> for his idea to disable VT.
---
 debian/changelog                   | 12 ++++++++----
 debian/config/armel/config.marvell | 18 ++++++++++++++----
 debian/config/armel/defines        |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d114f6731..1839493c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
 linux (4.16~rc6-1~exp2) UNRELEASED; urgency=medium
 
   [ Roger Shimizu ]
-  * Bring back armel build by extending the size limit for kernel image,
-    from 2097080 to 2729712. This will break a few qnap devices,
-    but keep other armel devices running.
-    Also revert two commits that disabled armel previously:
+  * [armel] Bring back armel build by reverting two commits that disabled
+    armel previously:
     - [2ed70eb] "Add empty featuresets for armel to help abiupdate script"
     - [5f62872] "(Temporarily) disable armel kernel image build"
+  * [armel] Reduce armel image size by:
+    - Set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+    - Change MTD, MTD_CMDLINE_PARTS, RTC_DRV_MV, and SPI_ORION from
+      built-in to module.
+    - Disable VT, ZSWAP, RD_BZIP2, and RD_LZMA.
+    Thanks to Leigh Brown <leigh@solinno.co.uk> for his idea to disable VT.
 
   [ Riku Voipio ]
   * [armhf] Add dove cubox support, thanks to Josua Mayer (Closes: #876774)
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index c5703aeeb..54967e879 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -120,6 +120,8 @@ CONFIG_SUN_PARTITION=y
 ## file: crypto/Kconfig
 ##
 # CONFIG_CRYPTO_FIPS is not set
+#. Saves about 95K
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_SHA256=m
 
 ##
@@ -351,9 +353,9 @@ CONFIG_MMC_MVSDIO=m
 ##
 ## file: drivers/mtd/Kconfig
 ##
-CONFIG_MTD=y
+CONFIG_MTD=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CMDLINE_PARTS=m
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_BLOCK=m
@@ -552,7 +554,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_MV=m
 
 ##
 ## file: drivers/scsi/Kconfig
@@ -616,7 +618,7 @@ CONFIG_RTC_DRV_MV=y
 ##
 ## file: drivers/spi/Kconfig
 ##
-CONFIG_SPI_ORION=y
+CONFIG_SPI_ORION=m
 
 ##
 ## file: drivers/ssb/Kconfig
@@ -634,6 +636,11 @@ CONFIG_FB_XGI=m
 CONFIG_THERMAL=m
 CONFIG_KIRKWOOD_THERMAL=m
 
+##
+## file: drivers/tty/Kconfig
+##
+# CONFIG_VT is not set
+
 ##
 ## file: drivers/tty/serial/8250/Kconfig
 ##
@@ -766,6 +773,7 @@ CONFIG_FLATMEM_MANUAL=y
 #. Saves about 7K
 # CONFIG_COMPACTION is not set
 # CONFIG_KSM is not set
+# CONFIG_ZSWAP is not set
 
 ##
 ## file: mm/Kconfig.debug
@@ -846,6 +854,8 @@ CONFIG_SND_KIRKWOOD_SOC=m
 ##
 ## file: usr/Kconfig
 ##
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
 
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index f40c4038e..b6f172dcc 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -32,7 +32,7 @@ recommends: u-boot-tools
 # HP Media Vault mv2120: 2097152 - 8 - 64 = 2097080
 # QNAP TS-109/TS-209 & TS-409: 2097152 - 8 - 64 = 2097080
 # Buffalo Linkstation LS-WSXL/WXL/WVL (from stock kernel): 2729776 - 64 = 2729712
-check-size: 2729712
+check-size: 2097080
 check-size-with-dtb: true
 ## Maximum uncompressed kernel size for supported devices
 # Buffalo Linkstation LS-WSXL/WXL/WVL: 7340032