From 3f0d58ef482b41d619449fa3d7db8b96ae4c252c Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Thu, 19 Sep 2013 22:21:07 +0000
Subject: [PATCH] [armhf] enable PCI for armmp

svn path=/dists/trunk/linux/; revision=20652
---
 debian/changelog                              |  4 +
 debian/config/armhf/config.armmp              | 85 +++++++++++++++++++
 .../armhf/modules/armhf-armmp/nic-modules     |  1 +
 .../armhf/modules/armhf-armmp/scsi-modules    |  2 +
 debian/installer/modules/nic-modules          |  2 +-
 5 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 debian/installer/armhf/modules/armhf-armmp/scsi-modules

diff --git a/debian/changelog b/debian/changelog
index b7ec88e1a..edcb7faa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,10 @@ linux (3.11.1-1~exp1) UNRELEASED; urgency=low
   * [arm] thermal: Re-enable CPU_THERMAL as built-in (regression in
     3.10~rc4-1~exp1)
 
+  [ Ian Campbell ]
+  * [armhf] Enable CONFIG_PCI for multiplatform flavour.
+    - Enable standard NIC and SCSI modules and include in udebs.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 13 Sep 2013 04:37:21 +0100
 
 linux (3.11-1~exp1) experimental; urgency=low
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index e32142473..0ae5e6448 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -17,6 +17,8 @@ CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 ## end choice
 CONFIG_NEON=y
 
+CONFIG_PCI=y
+
 ##
 ## file: arch/arm/Kconfig.debug
 ##
@@ -332,6 +334,29 @@ CONFIG_MTD_NAND_MXC=m
 CONFIG_MTD_ONENAND=y
 CONFIG_MTD_ONENAND_OMAP2=m
 
+##
+## file: drivers/net/ethernet/Kconfig
+##
+CONFIG_FEALNX=m
+
+##
+## file: drivers/net/ethernet/3com/Kconfig
+##
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_TYPHOON=m
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=m
+
+##
+## file: drivers/net/ethernet/adaptec/Kconfig
+##
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+
 ##
 ## file: drivers/net/ethernet/allwinner/Kconfig
 ##
@@ -342,15 +367,63 @@ CONFIG_SUN4I_EMAC=m
 ##
 CONFIG_NET_CALXEDA_XGMAC=m
 
+##
+## file: drivers/net/ethernet/dec/tulip/Kconfig
+##
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+
 ##
 ## file: drivers/net/ethernet/marvell/Kconfig
 ##
 CONFIG_MVMDIO=m
 CONFIG_MVNETA=m
 
+##
+## file: drivers/net/ethernet/microchip/Kconfig
+##
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+
 ##
 ## file: drivers/net/ethernet/smsc/Kconfig
 ##
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_EPIC100=m
 CONFIG_SMC91X=m
 CONFIG_SMC911X=m
 CONFIG_SMSC911X=m
@@ -363,6 +436,12 @@ CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_CPSW=m
 
+##
+## file: drivers/net/fddi/Kconfig
+##
+CONFIG_FDDI=y
+CONFIG_SKFP=m
+
 ##
 ## file: drivers/net/phy/Kconfig
 ##
@@ -450,6 +529,12 @@ CONFIG_RTC_DRV_MV=m
 CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_MXC=m
 
+##
+## file: drivers/scsi/Kconfig
+##
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DC390T=m
+
 ##
 ## file: drivers/spi/Kconfig
 ##
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-modules b/debian/installer/armhf/modules/armhf-armmp/nic-modules
index 0dcebabfe..817104055 100644
--- a/debian/installer/armhf/modules/armhf-armmp/nic-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/nic-modules
@@ -1,3 +1,4 @@
+#include <nic-modules>
 mvneta
 mvmdio
 smsc911x
diff --git a/debian/installer/armhf/modules/armhf-armmp/scsi-modules b/debian/installer/armhf/modules/armhf-armmp/scsi-modules
new file mode 100644
index 000000000..675462a14
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/scsi-modules
@@ -0,0 +1,2 @@
+#include <scsi-modules>
+
diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules
index db1eaff23..c63ac774d 100644
--- a/debian/installer/modules/nic-modules
+++ b/debian/installer/modules/nic-modules
@@ -2,7 +2,7 @@
 3c515 ?
 3c523 ?
 3c527 ?
-3c59x
+3c59x ?
 8139cp
 8139too
 acenic ?