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 <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d7651b9c831fea3fbec9973b932c95c73e61ed3d..0f335d19e55f608e8842f7a2bce5d011f93596c9 100644 (file)
--- 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 4c6e70314b70ae2f1362e0e46f37104b66cafad6..1d2fff7416e2734e7b0896dd7a72badf924d991c 100644 (file)
--- 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 4423965234993898e3ca35fa89eff126981f7cb7..837039cf07c1f0b9703927ad094fdc9a22e16c63 100644 (file)
--- 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 97743e7c7022405f4eb6f2efb43a9f251bc1d09a..0f194260f77f3c8bc68b58a5a06a7e1ecbabb167 100644 (file)
--- 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 542955e13635d5a482f68ab3ddefbf9c94200293..f674cc849c2474656e46168d2fdbd8ee3d9bb19a 100644 (file)
--- 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 37f14e7703086bf5bb7936834e62aa8c7bb9d1a4..5cae9d2a77c59fd1e95acf9c3139a53ab7e4adc9 100644 (file)
--- 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 1cedb3c7654c8aaaa4688fc694b0d638e5f09ebe..9b3b9610846a8ce11b3eb293f5398c1770590d85 100644 (file)
--- 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 8b5684f93a871e4e204acc3d60f6fe83fb80f5c8..e5acadfa94f3aede39aecb7e192ed1bdcd4c84b6 100644 (file)
--- 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 73aceb7353b0169a9ecd7f0a591499152b1daebb..ffa6445aec271e665ad64537b23c5cc62f213e62 100644 (file)
--- 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 083d28f4e7b6ae0877010a116b97cf64d138cab3..856a7ff14b63c97e8def352d5c194cd832711eac 100644 (file)
--- 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 b762cc470aacf4925c3a2d052ff0962af667faef..53b3aff394e29404d1db061de9b694c8b1559272 100644 (file)
--- 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