UBUNTU: [Config] CONFIG_PCIEPORTBUS=n for ppc64el

BugLink: http://bugs.launchpad.net/bugs/1665404
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 11de6834bb9b70f2bab6bf93249e852e61ab5133..97518c7691a11cc8b0e94b6167709b16c0eb31ee 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -146,7 +146,6 @@ CONFIG_HIBERNATION=y
 CONFIG_HIO=m
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HPET=y
 CONFIG_HPFS_FS=m
@@ -317,6 +316,7 @@ CONFIG_PARAVIRT=y
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_PASID=y

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0970db909de9251c7c31ae226b423ca249121a2a..5672250fa941fc51ba755ee64fe534bf58a1cb00 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -154,8 +154,8 @@ CONFIG_PCI_MMCONFIG                             policy<{'amd64': 'y', 'i386': 'y
 CONFIG_PCI_CNB20LE_QUIRK                        policy<{'amd64': 'n', 'i386': 'n'}>
 
 # Menu: Bus options (PCI etc.) >> PCI support >> PCI Express Port Bus support
-CONFIG_PCIEPORTBUS                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_HOTPLUG_PCI_PCIE                         policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_PCIEPORTBUS                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_HOTPLUG_PCI_PCIE                         policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y', 'powerpc': 'y', 's390x': 'y'}>
 CONFIG_PCIEAER                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_PCIE_ECRC                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_PCIEAER_INJECT                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
@@ -164,6 +164,7 @@ CONFIG_PCIEASPM_DEBUG                           policy<{'amd64': 'y', 'arm64': '
 CONFIG_PCIE_DPC                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_PCIE_PTM                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 #
+CONFIG_PCIEPORTBUS                              mark<ENFORCED> note<LP#1665404>
 CONFIG_PCIEASPM_DEBUG                           note<LP#1398544>
 CONFIG_HOTPLUG_PCI_PCIE                         mark<ENFORCED> note<LP#1374440>
 CONFIG_PCIEAER_INJECT                           flag<TESTING>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 6e0308dd3a4f0f64ff9210e18c087932f7258701..ec2358bbe388c1d3beafabce0909f7ddc17b143b 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -157,7 +157,6 @@ CONFIG_HFS_FS=m
 # CONFIG_HIO is not set
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_HPET is not set
 CONFIG_HPFS_FS=m
@@ -327,6 +326,7 @@ CONFIG_OSF_PARTITION=y
 CONFIG_PARAVIRT=y
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=m
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index ff3c0610876930fa994880fb3211e433d077514c..6c0363448d7d394fb92cc45baf4c7dce5773f2a8 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -310,6 +310,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=m
 # CONFIG_PCCARD is not set
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 # CONFIG_PCI_LAYERSCAPE is not set
 CONFIG_PCI_MSI_IRQ_DOMAIN=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 840a9076fe38be71e33ad526044d4d91c9234227..d0228d6de32a37400189451c086a18d1339934e7 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3431,6 +3431,7 @@ CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_POWERNV=m
 CONFIG_HOTPLUG_PCI_RPA=m
 CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
@@ -6139,7 +6140,6 @@ CONFIG_PCIEASPM_DEBUG=y
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 # CONFIG_PCIEASPM_POWERSAVE is not set
-CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIE_ALTERA is not set
 CONFIG_PCIE_ARMADA_8K=y
 CONFIG_PCIE_DPC=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 90c56f1593805a747ca32399cd4c352dace274c4..a88b4a2d7c335aad5481af83335d75777d181fb5 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -143,7 +143,6 @@ CONFIG_HIBERNATION=y
 CONFIG_HIO=m
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HPET=y
 CONFIG_HPFS_FS=m
@@ -310,6 +309,7 @@ CONFIG_PARAVIRT=y
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_PASID=y

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index c590434a030bca4713e005f596072aa7470fb983..5fb99095d9843d75d097593d40372190a7e9c6b4 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -117,7 +117,6 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m
 # CONFIG_HIO is not set
 CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HPFS_FS=m
 CONFIG_HP_ILO=m
@@ -280,6 +279,7 @@ CONFIG_OSF_PARTITION=y
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 # CONFIG_PCI_MSI_IRQ_DOMAIN is not set
 CONFIG_PCI_PASID=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index a520910268908a474f6b545eb7313915e348b95f..272c9cedafac1709fdd50760ee3df5b2a66707ef 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -148,7 +148,6 @@ CONFIG_HFS_FS=m
 # CONFIG_HIO is not set
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_PCIE is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 CONFIG_HPFS_FS=m
 CONFIG_HP_ILO=m
@@ -328,6 +327,7 @@ CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=m
 # CONFIG_PCCARD is not set
+# CONFIG_PCIEPORTBUS is not set
 CONFIG_PCIPCWATCHDOG=m
 # CONFIG_PCI_MSI_IRQ_DOMAIN is not set
 CONFIG_PCI_PASID=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index cda5965a7ae44b2c278ac054ce0e3b7d96807a1b..d0cc4b30521bb21016bf64e5d61331b25afab36e 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -109,7 +109,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_HIBERNATION=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
@@ -256,6 +255,7 @@ CONFIG_NUMA_EMU=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_PARPORT is not set
+CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_MSI_IRQ_DOMAIN is not set
 # CONFIG_PCI_PASID is not set