From 8dede6cae95f7bab8ae184b64bd93291077f1c34 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 1 Feb 2017 23:35:16 +0000 Subject: [PATCH] [ppc64el] Explicitly limit IBMEBUS, EHEA to big-endian configurations From 4.10, IBMEBUS cannot be enabled in little-endian configurations and EHEA depends on it. Adjust our configuration so it's obvious we don't intend otherwise. --- debian/config/kernelarch-powerpc/config-arch-64 | 2 -- debian/config/kernelarch-powerpc/config-arch-64-be | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64 index fe7a96761..09595fc7c 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64 +++ b/debian/config/kernelarch-powerpc/config-arch-64 @@ -45,7 +45,6 @@ CONFIG_PPC_PSERIES=y CONFIG_PPC_SPLPAR=y CONFIG_SCANLOG=m # CONFIG_LPARCFG is not set -CONFIG_IBMEBUS=y ## ## file: block/partitions/Kconfig @@ -102,7 +101,6 @@ CONFIG_MTD_POWERNV_FLASH=m ## file: drivers/net/ethernet/ibm/Kconfig ## CONFIG_IBMVETH=m -CONFIG_EHEA=m ## ## file: drivers/net/ethernet/ibm/emac/Kconfig diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be index 71259df00..41663eb8a 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64-be +++ b/debian/config/kernelarch-powerpc/config-arch-64-be @@ -42,6 +42,11 @@ CONFIG_PS3_FLASH=m CONFIG_PS3_VRAM=m CONFIG_PS3_LPM=m +## +## file: arch/powerpc/platforms/pseries/Kconfig +## +CONFIG_IBMEBUS=y + ## ## file: drivers/char/hw_random/Kconfig ## @@ -70,6 +75,11 @@ CONFIG_WINDFARM_PM91=m CONFIG_WINDFARM_PM112=m CONFIG_WINDFARM_PM121=m +## +## file: drivers/net/ethernet/ibm/Kconfig +## +CONFIG_EHEA=m + ## ## file: drivers/net/ethernet/pasemi/Kconfig ##