From dfee9619965767ed9aa0e9da95aa9140fbbcd262 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Thu, 7 Jun 2012 15:42:46 +0100 Subject: [PATCH 23/34] UBUNTU: [Config] highbank -- commonise I2C settings Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 13 ------------- debian.master/config/armel/config.common.armel | 13 ------------- debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/armhf/config.flavour.highbank | 14 -------------- debian.master/config/armhf/config.flavour.omap | 14 -------------- debian.master/config/config.common.ubuntu | 13 +++++++++++++ debian.master/config/i386/config.common.i386 | 13 ------------- debian.master/config/powerpc/config.common.powerpc | 13 ------------- debian.master/config/ppc64/config.common.ppc64 | 13 ------------- 9 files changed, 14 insertions(+), 93 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index bc821da..cb69f60 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -143,21 +143,8 @@ CONFIG_HUGETLB_PAGE=y CONFIG_HW_RANDOM=y CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_GPIO=m # CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_MUX=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PXA_PCI is not set -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_STUB=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_XILINX=m # CONFIG_IDE is not set CONFIG_IIO=m CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index e2095e2..e2da4ea 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -134,22 +134,9 @@ CONFIG_HVC_DCC=y CONFIG_HW_RANDOM=y CONFIG_HZ=128 CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_CHARDEV=m CONFIG_I2C_DESIGNWARE_PLATFORM=m -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_GPIO=m # CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_MUX=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PXA_PCI is not set -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_STUB=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_XILINX=m CONFIG_IIO=m CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 6170050..bbb0c7c 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -48,6 +48,7 @@ CONFIG_HAVE_AOUT=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y # CONFIG_HUGETLB_PAGE is not set CONFIG_I2C_ALGOBIT=m +# CONFIG_I2C_HELPER_AUTO is not set # CONFIG_I2C_PXA_PCI is not set # CONFIG_IWMC3200TOP_DEBUGFS is not set CONFIG_KGDB=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 1c9fc65..a894cc5 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -87,21 +87,7 @@ CONFIG_HIGHMEM=y # CONFIG_HVC_DCC is not set # CONFIG_HW_RANDOM is not set CONFIG_HZ=100 -# CONFIG_I2C_CHARDEV is not set CONFIG_I2C_DESIGNWARE_PLATFORM=y -# CONFIG_I2C_DIOLAN_U2C is not set -# CONFIG_I2C_GPIO is not set -CONFIG_I2C_HELPER_AUTO=y -# CONFIG_I2C_MUX is not set -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_PARPORT is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PCA_PLATFORM is not set -# CONFIG_I2C_SIMTEC is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set -# CONFIG_I2C_XILINX is not set # CONFIG_IIO is not set # CONFIG_INLINE_READ_UNLOCK is not set # CONFIG_INLINE_READ_UNLOCK_IRQ is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 1f82eb0..d787de4 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -87,21 +87,7 @@ CONFIG_HTC_PASIC3=m CONFIG_HVC_DCC=y CONFIG_HW_RANDOM=y CONFIG_HZ=128 -CONFIG_I2C_CHARDEV=m CONFIG_I2C_DESIGNWARE_PLATFORM=m -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_GPIO=m -# CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_MUX=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PCA_PLATFORM=m -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_STUB=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_XILINX=m CONFIG_IIO=m CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ad9dd9d..a7c36fb 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2085,37 +2085,50 @@ CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m CONFIG_I2C_COMPAT=y # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CORE is not set CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_EG20T=m +CONFIG_I2C_GPIO=m CONFIG_I2C_HYDRA=m CONFIG_I2C_I801=m CONFIG_I2C_INTEL_MID=m CONFIG_I2C_ISCH=m CONFIG_I2C_MPC=m +CONFIG_I2C_MUX=m CONFIG_I2C_MUX_GPIO=m CONFIG_I2C_MUX_PCA9541=m CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_OCORES=m CONFIG_I2C_OMAP=y +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PASEMI=m CONFIG_I2C_PCA_ISA=m +CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PIIX4=m CONFIG_I2C_POWERMAC=y CONFIG_I2C_PXA=m CONFIG_I2C_SCMI=m CONFIG_I2C_SI470X=m CONFIG_I2C_SI4713=m +CONFIG_I2C_SIMTEC=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m CONFIG_I2C_SMBUS=m +CONFIG_I2C_STUB=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m +CONFIG_I2C_XILINX=m CONFIG_I2O=m CONFIG_I2O_BLOCK=m CONFIG_I2O_BUS=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index d41d51d..9c7ba39 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -143,20 +143,7 @@ CONFIG_HUGETLB_PAGE=y CONFIG_HW_RANDOM=y CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_GPIO=m # CONFIG_I2C_HELPER_AUTO is not set -CONFIG_I2C_MUX=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PCA_PLATFORM=m -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_STUB=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_XILINX=m # CONFIG_IDE is not set CONFIG_IIO=m CONFIG_ILLEGAL_POINTER_VALUE=0 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index afba0ff..f866b69 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -130,21 +130,8 @@ CONFIG_HTC_PASIC3=m CONFIG_HW_RANDOM=y CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_GPIO=m CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_MUX=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PXA_PCI is not set -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_STUB=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_XILINX=m # CONFIG_IBMEBUS is not set # CONFIG_IDE is not set CONFIG_IIO=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 1ec81ca..2f85b08 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -141,21 +141,8 @@ CONFIG_HVC_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_GPIO=m CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_MUX=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PXA_PCI is not set -CONFIG_I2C_SIMTEC=m -CONFIG_I2C_STUB=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_XILINX=m CONFIG_IBMEBUS=y CONFIG_IDE=y CONFIG_IIO=m -- 1.7.9.5