diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-02-21 14:54:19 +0100 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-11-05 14:37:44 +0100 |
| commit | 4a41f7a1ae0ea025d8042707833489e5b3782ba1 (patch) | |
| tree | 2f533927ef49add27c420378f52b9ef05940e0fb /debian.master | |
| parent | a88ef6f2c54ddf09d6163e9ccbb61cffddcf28ea (diff) | |
UBUNTU: Config update
* K3.4
* Enable RPMSG
* Enable VIRTIO
* Config update vs 3.3.0-1482.3
Signed-off-by: Xavier Boudet <x-boudet@ti.com>
Config updates
Signed-off-by: Xavier Boudet <x-boudet@ti.com>
Diffstat (limited to 'debian.master')
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 6 | ||||
| -rw-r--r-- | debian.master/config/enforce | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1492e9c977df..7978eef35f47 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5816,9 +5816,9 @@ CONFIG_USE_OF=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_UTS_NS=y CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_I1480U=m -CONFIG_UWB_WHCI=m +# CONFIG_UWB_HWA is not set +# CONFIG_UWB_I1480U is not set +# CONFIG_UWB_WHCI is not set CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_USB_DRIVERS=y diff --git a/debian.master/config/enforce b/debian.master/config/enforce index 08a7a056826a..8987b1437553 100644 --- a/debian.master/config/enforce +++ b/debian.master/config/enforce @@ -9,9 +9,7 @@ value CONFIG_SECURITY y !exists CONFIG_SECURITY_FILE_CAPABILITIES | value CONFIG_SECURITY_FILE_CAPABILITIES y value CONFIG_SECURITY_SELINUX y value CONFIG_SECURITY_SMACK y -value CONFIG_SECURITY_YAMA y value CONFIG_SYN_COOKIES y -value CONFIG_DEFAULT_SECURITY_APPARMOR y # For architectures which support this option ensure it is enabled. !exists CONFIG_SECCOMP | value CONFIG_SECCOMP y !exists CONFIG_HAVE_SECCOMP_FILTER | value CONFIG_SECCOMP_FILTER y @@ -63,9 +61,6 @@ value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA # Build in uinput module so that it's always available (LP: 584812) value CONFIG_INPUT_UINPUT y -# upstart relies on getting all of the kernel arguments -value CONFIG_INIT_PASS_ALL_PARAMS y - # Enabling CONFIG_IMA is vastly expensive, ensure it is off value CONFIG_IMA n |