[linux] 02/05: [armel/marvell] Disable support for DNS-323

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 401df5efb5e12396f028fcc1737b6de9c4ce1df8
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jan 27 15:00:03 2016 +0000

    [armel/marvell] Disable support for DNS-323
    
    The kernel image was already too large for this machine.
    
    - Disable MACH_DNS323
    - Change MTD_CFI_AMDSTD from built-in to module
---
 debian/changelog                   | 5 +++++
 debian/config/armel/config.marvell | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 832c99b..af808ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,11 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
   * linux-headers: Make postinst script less verbose (see: #734266)
   * [rt] Update to 4.4-rt3
   * [armel] Replace kirkwood and orion5x flavours with a 'marvell' flavour
+  * [armel/marvell] Adjust configuration to reduce image size:
+    - Disable support for DNS-323 as the kernel image was already too large
+      for this machine
+      + Disable MACH_DNS323
+      + Change MTD_CFI_AMDSTD from built-in to module
 
  -- Ian Campbell <ijc at debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index ab7da22..d65dd06 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -49,7 +49,8 @@ CONFIG_MACH_DB88F5281=y
 CONFIG_MACH_RD88F5182=y
 CONFIG_MACH_RD88F5182_DT=y
 CONFIG_MACH_KUROBOX_PRO=y
-CONFIG_MACH_DNS323=y
+#. Only 1.5 MB flash available for kernel
+# CONFIG_MACH_DNS323 is not set
 CONFIG_MACH_TS209=y
 CONFIG_MACH_TERASTATION_PRO2=y
 CONFIG_MACH_LINKSTATION_PRO=y
@@ -348,7 +349,7 @@ CONFIG_MTD_CFI_I4=y
 #. Needed e.g. on QNAP devices
 CONFIG_MTD_CFI_INTELEXT=y
 #. Needed e.g. on the D-Link DNS-323
-CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_AMDSTD=m
 CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git