UBUNTU: [Config] enable binder and ashmem as modules

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 927757c2d42c61fa831e6d6ff0ff7f54299564fa..0c82b0d61b08d1888098aedd517e94c89a0f2e61 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -14,6 +14,7 @@ CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALTERA_TSE=m
 CONFIG_AMIGA_PARTITION=y
+CONFIG_ANDROID=y
 CONFIG_APPLICOM=m
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_ARCH_MMAP_RND_BITS=28

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 8c7195d349f66d7f058015cd7dd2fab34dad1f9d..496f30a0d48c2c11cfdbc9908ba3cdb4fd69ccea 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -12,6 +12,7 @@ CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALTERA_TSE=m
 CONFIG_AMIGA_PARTITION=y
+CONFIG_ANDROID=y
 CONFIG_APPLICOM=m
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_EXYNOS is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 1299172b1f7cd92370fcec56c154164ec8972632..46836dd78cf540c12839c8cb666d80d3055baec7 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -11,6 +11,7 @@ CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALTERA_TSE=m
 CONFIG_AMIGA_PARTITION=y
+CONFIG_ANDROID=y
 CONFIG_APPLICOM=m
 CONFIG_ARCH_ALPINE=y
 CONFIG_ARCH_EXYNOS=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ca88a8cfd9d05026f36c53eb5c6cfcb1250ce685..1726db451597f7311f532e266401d5d6a84fcc3e 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -272,7 +272,11 @@ CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_DCB=y
 CONFIG_AMD_XGBE_HAVE_ECC=y
 CONFIG_AMILO_RFKILL=m
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID_BINDERFS=m
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_IPC=m
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# CONFIG_ANDROID_VSOC is not set
 CONFIG_ANON_INODES=y
 CONFIG_APB_TIMER=y
 CONFIG_APDS9300=m
@@ -717,6 +721,7 @@ CONFIG_ARM_TI_CPUFREQ=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AS3935=m
+CONFIG_ASHMEM=m
 CONFIG_ASIX_PHY=m
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
@@ -4423,6 +4428,7 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_SUPPORT=y
+# CONFIG_ION is not set
 CONFIG_IOSCHED_BFQ=m
 CONFIG_IOSF_MBI=y
 CONFIG_IOSF_MBI_DEBUG=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 19fb69a8b5d9775253ee59efdea31f105532d99f..76df9fbb7aeff01d7a0d133b7f3a53ca39450126 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -14,6 +14,7 @@ CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALTERA_TSE=m
 CONFIG_AMIGA_PARTITION=y
+CONFIG_ANDROID=y
 CONFIG_APPLICOM=m
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_MMAP_RND_BITS=8

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d0130b9eeef60a9bc1c325af95fdeaae3d868f3d..99bfe403495763ea4989b70877cf0d065de34ac7 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -11,6 +11,7 @@ CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALTERA_TSE=m
 CONFIG_AMIGA_PARTITION=y
+CONFIG_ANDROID=y
 CONFIG_APPLICOM=m
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_ARCH_MMAP_RND_BITS_MAX=29

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 7007d3ffde6a04a89745d2ac85287e356d1d708c..cede71c483562794dc3462051ff5c4159e7bb67f 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -10,6 +10,7 @@
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_ALTERA_TSE is not set
 # CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ANDROID is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ATA is not set