From b3b60bbdd13a9702dbd8e00bd9b35d49b625df31 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 6 May 2015 23:58:01 +0000
Subject: [PATCH] [armel/orion5x] Increase maximum kernel image size to ~2 MB,
 removing support for DNS-323 (fixes FTBFS)

- Re-enable BLK_DEV_INTEGRITY, SCSI_UFSHCD, TCM_IBLOCK, AUDIT, USER_NS,
  PCI_QUIRKS, FTRACE, DEBUG_BUGVERBOSE, SECURITY
- Enable DYNAMIC_DEBUG, FRONTSWAP

svn path=/dists/trunk/linux/; revision=22562
---
 debian/changelog                   |  5 ++++
 debian/config/armel/config.orion5x | 46 ------------------------------
 debian/config/armel/defines        |  4 +--
 3 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af428379b..088a9f962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ linux (4.0.1-1~exp1) UNRELEASED; urgency=medium
   * debian.py,gencontrol.py: Fix the version sanity checks for backports and
     security/LTS uploads
   * ipv4: Missing sk_nulls_node_init() in ping_unhash() (CVE-2015-3636)
+  * [armel/orion5x] Increase maximum kernel image size to ~2 MB, removing
+    support for DNS-323 (fixes FTBFS)
+    - Re-enable BLK_DEV_INTEGRITY, SCSI_UFSHCD, TCM_IBLOCK, AUDIT, USER_NS,
+      PCI_QUIRKS, FTRACE, DEBUG_BUGVERBOSE, SECURITY
+    - Enable DYNAMIC_DEBUG, FRONTSWAP
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 7e9a7696f..08780eb65 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -52,12 +52,6 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 
-##
-## file: block/Kconfig
-##
-#. Saves about 4K
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
 ##
 ## file: block/partitions/Kconfig
 ##
@@ -488,23 +482,11 @@ CONFIG_RTC_DRV_S35390A=y
 ##
 # CONFIG_SCSI_QLA_ISCSI is not set
 
-##
-## file: drivers/scsi/ufs/Kconfig
-##
-#. Selects PM_DEVFREQ, which will add some built-in code
-# CONFIG_SCSI_UFSHCD is not set
-
 ##
 ## file: drivers/ssb/Kconfig
 ##
 # CONFIG_SSB is not set
 
-##
-## file: drivers/target/Kconfig
-##
-#. Selects BLK_DEV_INTEGRITY, which will add some built-in code
-# CONFIG_TCM_IBLOCK is not set
-
 ##
 ## file: drivers/tty/serial/8250/Kconfig
 ##
@@ -557,28 +539,6 @@ CONFIG_FB=m
 ##
 CONFIG_ORION_WATCHDOG=m
 
-##
-## file: init/Kconfig
-##
-# CONFIG_AUDIT is not set
-# CONFIG_AUDITSYSCALL is not set
-#. Saves about 5K
-# CONFIG_USER_NS is not set
-#. Saves about 17K, and none of the quirks are likely to be needed
-# CONFIG_PCI_QUIRKS is not set
-
-##
-## file: kernel/trace/Kconfig
-##
-# CONFIG_FTRACE is not set
-
-##
-## file: lib/Kconfig.debug
-##
-# CONFIG_DYNAMIC_DEBUG is not set
-#. This really sucks, but saves about 2%
-# CONFIG_DEBUG_BUGVERBOSE is not set
-
 ##
 ## file: mm/Kconfig
 ##
@@ -587,7 +547,6 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
-# CONFIG_FRONTSWAP is not set
 
 ##
 ## file: net/atm/Kconfig
@@ -603,8 +562,3 @@ CONFIG_AX25=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-##
-## file: security/Kconfig
-##
-# CONFIG_SECURITY is not set
-
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 0e8c51650..c81e5916b 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -39,10 +39,10 @@ hardware-long: Marvell Orion 5181, 5182 and 5281 based systems (QNAP TS-109/TS-2
 
 [orion5x_image]
 recommends: uboot-mkimage
-# D-Link DNS-323: 1572864 - 8 - 64 = 1572792
+# D-Link DNS-323: 1572864 - 8 - 64 = 1572792 (too small, no longer supported)
 # HP Media Vault mv2120: ca 2 MB
 # QNAP TS-109/TS-209 & TS-409: 2097152 - 8 - 64 = 2097080
-check-size: 1572792
+check-size: 2097080
 check-size-with-dtb: true
 configs:
  armel/config-reduced