diff options
author | Paolo Pisati <paolo.pisati@canonical.com> | 2011-08-16 12:45:54 -0400 |
---|---|---|
committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:19:30 -0400 |
commit | 8a69faee81ec964aa221c8e4542f47f4f32c7dbc (patch) | |
tree | 65e13670d2e6e626c048a10dcf8e1460ef48c4d3 | |
parent | d193f4c84bd70f1ff52fc3230570b71abcfd3396 (diff) |
UBUNTU: [Config] Sync config
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
-rw-r--r-- | debian.ti-omap4/config/config.common.ubuntu | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index 3ffa416cfcc..59d08111aa4 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu | |||
@@ -2121,6 +2121,7 @@ CONFIG_OMAP2_VRFB=y | |||
2121 | # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set | 2121 | # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set |
2122 | # CONFIG_OMAP3_SDRC_AC_TIMING is not set | 2122 | # CONFIG_OMAP3_SDRC_AC_TIMING is not set |
2123 | CONFIG_OMAP4_DSS_HDMI=y | 2123 | CONFIG_OMAP4_DSS_HDMI=y |
2124 | # CONFIG_OMAP4_USE_OLD_API_VIDEO is not set | ||
2124 | CONFIG_OMAP_32K_TIMER=y | 2125 | CONFIG_OMAP_32K_TIMER=y |
2125 | CONFIG_OMAP_32K_TIMER_HZ=128 | 2126 | CONFIG_OMAP_32K_TIMER_HZ=128 |
2126 | CONFIG_OMAP_DM_TIMER=y | 2127 | CONFIG_OMAP_DM_TIMER=y |
@@ -2134,6 +2135,7 @@ CONFIG_OMAP_PACKAGE_CBL=y | |||
2134 | CONFIG_OMAP_PACKAGE_CBS=y | 2135 | CONFIG_OMAP_PACKAGE_CBS=y |
2135 | # CONFIG_OMAP_PM_NONE is not set | 2136 | # CONFIG_OMAP_PM_NONE is not set |
2136 | CONFIG_OMAP_PM_NOOP=y | 2137 | CONFIG_OMAP_PM_NOOP=y |
2138 | CONFIG_OMAP_REMOTE_PROC=y | ||
2137 | # CONFIG_OMAP_RESET_CLOCKS is not set | 2139 | # CONFIG_OMAP_RESET_CLOCKS is not set |
2138 | CONFIG_OMAP_SMARTREFLEX=y | 2140 | CONFIG_OMAP_SMARTREFLEX=y |
2139 | CONFIG_OMAP_SMARTREFLEX_CLASS3=y | 2141 | CONFIG_OMAP_SMARTREFLEX_CLASS3=y |
@@ -2752,6 +2754,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
2752 | CONFIG_SYSV_FS=m | 2754 | CONFIG_SYSV_FS=m |
2753 | # CONFIG_SYS_HYPERVISOR is not set | 2755 | # CONFIG_SYS_HYPERVISOR is not set |
2754 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 2756 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
2757 | # CONFIG_Sys_Link is not set | ||
2755 | CONFIG_TABLET_USB_ACECAD=m | 2758 | CONFIG_TABLET_USB_ACECAD=m |
2756 | CONFIG_TABLET_USB_AIPTEK=m | 2759 | CONFIG_TABLET_USB_AIPTEK=m |
2757 | CONFIG_TABLET_USB_GTCO=m | 2760 | CONFIG_TABLET_USB_GTCO=m |
@@ -2794,13 +2797,11 @@ CONFIG_TICK_ONESHOT=y | |||
2794 | # CONFIG_TIDSPBRIDGE is not set | 2797 | # CONFIG_TIDSPBRIDGE is not set |
2795 | CONFIG_TILER_ALIGNMENT=4096 | 2798 | CONFIG_TILER_ALIGNMENT=4096 |
2796 | CONFIG_TILER_CACHE_LIMIT=40 | 2799 | CONFIG_TILER_CACHE_LIMIT=40 |
2797 | CONFIG_TILER_ENABLE_NV12=y | ||
2798 | CONFIG_TILER_ENABLE_USERSPACE=y | ||
2799 | CONFIG_TILER_EXPOSE_SSPTR=y | 2800 | CONFIG_TILER_EXPOSE_SSPTR=y |
2800 | CONFIG_TILER_GRANULARITY=128 | 2801 | CONFIG_TILER_GRANULARITY=128 |
2801 | # CONFIG_TILER_SECURE is not set | 2802 | # CONFIG_TILER_SECURE is not set |
2802 | CONFIG_TILER_SECURITY=1 | 2803 | CONFIG_TILER_SECURITY=1 |
2803 | CONFIG_TILER_SSPTR_ID=0 | 2804 | CONFIG_TILER_SSPTR_ID=1 |
2804 | # CONFIG_TIMB_DMA is not set | 2805 | # CONFIG_TIMB_DMA is not set |
2805 | CONFIG_TIMERFD=y | 2806 | CONFIG_TIMERFD=y |
2806 | CONFIG_TIMER_STATS=y | 2807 | CONFIG_TIMER_STATS=y |