From: Seth Forshee Date: Fri, 18 Nov 2016 19:37:40 +0000 (-0600) Subject: UBUNTU: [Config] Fix up CONFIG_I2C_SLAVE values X-Git-Tag: Ubuntu-4.10.0-9.11~191 X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-zesty-kernel.git;a=commitdiff_plain;h=c8a11f66389ef38ed7253f1f23b32ec3b9db7a54 UBUNTU: [Config] Fix up CONFIG_I2C_SLAVE values The annotations file says this should be =n on all architectures except for armhf, but it is currently =y on several others. This is because it's being selected by CONFIG_I2C_EMEV2, which is only really relevant for armhf, and CONFIG_I2C_RCAR, which is only relevant on armhf and arm64. Disable CONFIG_I2C_EMEV2 and CONFIG_I2C_SLAVE for all other architectures, and update the annotations file entry for CONFIG_I2C_EMEV2 accordingly. Signed-off-by: Seth Forshee --- diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index d7651b9c831f..0f335d19e55f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -156,8 +156,8 @@ CONFIG_HWMON=y CONFIG_HW_RANDOM_TIMERIOMEM=m # CONFIG_HZ_100 is not set CONFIG_I2C=y -CONFIG_I2C_SLAVE=y -# CONFIG_I2C_SLAVE_EEPROM is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_SLAVE is not set CONFIG_I6300ESB_WDT=m CONFIG_IEEE802154=m # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 4c6e70314b70..1d2fff7416e2 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1942,7 +1942,7 @@ CONFIG_I2C_CPM policy<{'powerpc-powerpc-e500mc' CONFIG_I2C_DESIGNWARE_PLATFORM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}> CONFIG_I2C_DESIGNWARE_PCI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}> CONFIG_I2C_EG20T policy<{'i386': 'm'}> -CONFIG_I2C_EMEV2 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc-powerpc64-emb': 'm', 'powerpc-powerpc-e500mc': 'm'}> +CONFIG_I2C_EMEV2 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'm', 'i386': 'n', 'powerpc': 'n'}> CONFIG_I2C_EXYNOS5 policy<{'armhf': 'm'}> CONFIG_I2C_GPIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}> CONFIG_I2C_IMX policy<{'arm64': 'm', 'armhf-generic': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 442396523499..837039cf07c1 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -170,9 +170,9 @@ CONFIG_HZ=250 # CONFIG_HZ_1000 is not set CONFIG_HZ_250=y CONFIG_I2C=y +# CONFIG_I2C_EMEV2 is not set CONFIG_I2C_IMX=m CONFIG_I2C_SLAVE=y -# CONFIG_I2C_SLAVE_EEPROM is not set CONFIG_I6300ESB_WDT=m CONFIG_IEEE802154=m # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 97743e7c7022..0f194260f77f 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -157,9 +157,9 @@ CONFIG_HZ=250 # CONFIG_HZ_1000 is not set CONFIG_HZ_250=y CONFIG_I2C=y +CONFIG_I2C_EMEV2=m CONFIG_I2C_IMX=y CONFIG_I2C_SLAVE=y -CONFIG_I2C_SLAVE_EEPROM=m CONFIG_I6300ESB_WDT=m CONFIG_IEEE802154=m # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 542955e13635..f674cc849c24 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3464,7 +3464,6 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_DLN2=m CONFIG_I2C_EG20T=m -CONFIG_I2C_EMEV2=m CONFIG_I2C_EXYNOS5=m CONFIG_I2C_GPIO=m CONFIG_I2C_HELPER_AUTO=y @@ -3513,6 +3512,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m +CONFIG_I2C_SLAVE_EEPROM=m CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m CONFIG_I2C_TAOS_EVM=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 37f14e770308..5cae9d2a77c5 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -153,8 +153,8 @@ CONFIG_HWMON=y CONFIG_HW_RANDOM_TIMERIOMEM=m # CONFIG_HZ_100 is not set CONFIG_I2C=y -CONFIG_I2C_SLAVE=y -# CONFIG_I2C_SLAVE_EEPROM is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_SLAVE is not set CONFIG_I6300ESB_WDT=m CONFIG_IEEE802154=m # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 1cedb3c7654c..9b3b9610846a 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -130,7 +130,8 @@ CONFIG_HZ=250 # CONFIG_HZ_1000 is not set CONFIG_HZ_250=y CONFIG_I2C=y -# CONFIG_I2C_SLAVE_EEPROM is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_SLAVE is not set CONFIG_I6300ESB_WDT=m # CONFIG_IBMEBUS is not set CONFIG_IBMVETH=m diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic index 8b5684f93a87..e5acadfa94f3 100644 --- a/debian.master/config/powerpc/config.flavour.generic +++ b/debian.master/config/powerpc/config.flavour.generic @@ -33,7 +33,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HIBERNATION=y CONFIG_HOTPLUG_CPU=y CONFIG_HUGETLB_PAGE=y -# CONFIG_I2C_SLAVE is not set # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set CONFIG_IMA=y # CONFIG_IWLWIFI_PCIE_RTPM is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc index 73aceb7353b0..ffa6445aec27 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc +++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc @@ -33,7 +33,6 @@ CONFIG_HAS_RAPIDIO=y CONFIG_HIBERNATION=y CONFIG_HOTPLUG_CPU=y CONFIG_HUGETLB_PAGE=y -CONFIG_I2C_SLAVE=y CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y CONFIG_IMA=y CONFIG_IWLWIFI_PCIE_RTPM=y diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index 083d28f4e7b6..856a7ff14b63 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -33,7 +33,6 @@ CONFIG_GPIO_GENERIC=m CONFIG_HIBERNATION=y CONFIG_HOTPLUG_CPU=y # CONFIG_HUGETLB_PAGE is not set -# CONFIG_I2C_SLAVE is not set # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set CONFIG_IMA=y # CONFIG_IWLWIFI_PCIE_RTPM is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb index b762cc470aac..53b3aff394e2 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-emb +++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb @@ -33,7 +33,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y # CONFIG_HIBERNATION is not set # CONFIG_HOTPLUG_CPU is not set CONFIG_HUGETLB_PAGE=y -CONFIG_I2C_SLAVE=y CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y # CONFIG_IMA is not set CONFIG_IWLWIFI_PCIE_RTPM=y