From: jk7744.park <jk7744.park@samsung.com>
Date: Sat, 24 Oct 2015 06:28:05 +0000 (+0900)
Subject: tizen 2.4 release
X-Git-Tag: accepted/tizen/2.4/mobile/20151029.042348^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_2.4_mobile;p=adaptation%2Fap_samsung%2Fxserver-xorg-misc-exynos.git

tizen 2.4 release
---

diff --git a/mobile/arm-common/Xmodmap b/mobile/arm-common/Xmodmap
deleted file mode 100644
index be42e4b..0000000
--- a/mobile/arm-common/Xmodmap
+++ /dev/null
@@ -1,25 +0,0 @@
-keycode 123 = XF86AudioRaiseVolume
-keycode 122 = XF86AudioLowerVolume
-keycode 231 = Cancel
-keycode 177 = XF86Send
-keycode 147 = XF86Phone
-keycode 166 = XF86Stop
-keycode 225 = XF86Search
-keycode 124 = XF86PowerOff
-keycode 179 = XF86WebCam
-keycode 220 = XF86Pictures
-keycode 208 = XF86AudioPlay
-keycode 209 = XF86AudioPause
-keycode 174 = XF86AudioStop
-keycode 171 = XF86AudioNext
-keycode 173 = XF86AudioPrev
-keycode 176 = XF86AudioRewind
-keycode 216 = XF86AudioForward
-keycode 234 = XF86AudioMedia
-keycode 153 = 
-keycode 239 = 
-keycode 136 = 
-keycode 140 =
-keycode 182 =
-keycode 172 =
-keycode 215 =
diff --git a/mobile/arm-common/Xorg.sh b/mobile/arm-common/Xorg.sh
index 79a0def..b6ff0aa 100755
--- a/mobile/arm-common/Xorg.sh
+++ b/mobile/arm-common/Xorg.sh
@@ -1,2 +1,3 @@
 export HOME=/root
 export DISPLAY=:0
+export XDG_RUNTIME_DIR=/tmp
diff --git a/mobile/arm-common/startx.in b/mobile/arm-common/startx.in
index de26f38..a4bba05 100755
--- a/mobile/arm-common/startx.in
+++ b/mobile/arm-common/startx.in
@@ -2,7 +2,7 @@
 
 DISPLAY=":0"
 LOGDIR="/var/log"
-XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d -nolisten tcp "
 OTHER_OPTIONS=" -logfile ${LOGDIR}/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone "
 
 #run script to enable gl
diff --git a/mobile/arm-common/tizen_layout_mobile.txt b/mobile/arm-common/tizen_layout_mobile.txt
new file mode 100644
index 0000000..198796a
--- /dev/null
+++ b/mobile/arm-common/tizen_layout_mobile.txt
@@ -0,0 +1,37 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 169
+XF86Home 139
+XF86Back 158
+XF86Camera 171
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86QuickPanel 183
+XF86TaskPane 184
+XF86HomePage 172
+XF86WWW 150
+XF86Mail 155
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+Hangul 122 keyboard
+XF86Apps 204
+XF86Call 218
+XF86Game 220
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203
diff --git a/mobile/arm-common/xinitrc b/mobile/arm-common/xinitrc
index f2060e1..16668f8 100755
--- a/mobile/arm-common/xinitrc
+++ b/mobile/arm-common/xinitrc
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-/usr/bin/scim -d &
-
 # set dpi
 if [ -x /usr/bin/xrdb ]; then
 	if [ -e ~/.Xresources ]; then
diff --git a/mobile/arm-common/xresources b/mobile/arm-common/xresources
index 0693afe..351004b 100755
--- a/mobile/arm-common/xresources
+++ b/mobile/arm-common/xresources
@@ -11,8 +11,6 @@ case "$1" in
       else
         /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
       fi
-	  mkdir -p /tmp/hibernation
-	  touch /tmp/hibernation/xresources_ready
     fi
   ;;
 
diff --git a/mobile/arm-e4412/xorg.conf.d/display.conf b/mobile/arm-e4412/xorg.conf.d/display.conf
index 5467a6c..997f47d 100755
--- a/mobile/arm-e4412/xorg.conf.d/display.conf
+++ b/mobile/arm-e4412/xorg.conf.d/display.conf
@@ -24,7 +24,11 @@ Section "Device"
         Driver                  "exynos"
         Option                  "exa"           "true"
         Option                  "dri2"          "true"
+        Option                  "dri3"          "true"
+        Option                  "present"       "true"
         Option                  "sw_exa"        "true"
         Option                  "tfb"           "true"
+        Option                  "hwc"           "true"
         Option                  "cachable"      "false"
+        Option                  "scanout"       "true"
 EndSection
diff --git a/mobile/arm-e4412/xorg.conf.d/input.conf b/mobile/arm-e4412/xorg.conf.d/input.conf
index dfbbbc6..6c62a09 100755
--- a/mobile/arm-e4412/xorg.conf.d/input.conf
+++ b/mobile/arm-e4412/xorg.conf.d/input.conf
@@ -8,7 +8,7 @@ Section "InputClass"
         Identifier "evdev touchscreen catchall"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
+        Driver "evdev"
         Option "MultiTouch"     "10"
 EndSection
 
@@ -30,4 +30,19 @@ Section "InputDevice"
         Identifier "Gesture"
         Driver  "gesture"
         Option  "Device"        "/dev/null"
+        Option  "PassKey1"	"121"	#Audio Mute Key
+        Option  "PassKey2"	"122"	#Volume Down Key
+        Option  "PassKey3"	"123"	#Volume Up Key
+        Option  "PassKey4"	"124"	#Power Key
+        Option  "PassKey5"	"171"	#Next Song Key
+        Option  "PassKey6"	"172"	#Audio PlayPause Key
+        Option  "PassKey7"	"173"	#Previous Song Key
+        Option  "PassKey8"	"174"	#Audio Stop Key
+        Option  "PassKey9"	"176"	#Audio Rewind Key
+        Option  "PassKey10"	"208"	#Audio Play Key
+        Option  "PassKey11"	"209"	#Audio Pause Key
+        Option  "PassKey12"	"216"	#Audio Forward Key
+        Option  "PassKey13"	"234"	#Audio Media Key
+        Option  "PassKey14"	"210"	#Voice Wakeup LPSD Key
+        Option  "PassKey15"	"211"	#Voice Wakeup Key
 EndSection
diff --git a/mobile/xorg-x11-misc-exynos.manifest b/mobile/xorg-x11-misc-exynos.manifest
index 2c4e9f3..0ffb447 100644
--- a/mobile/xorg-x11-misc-exynos.manifest
+++ b/mobile/xorg-x11-misc-exynos.manifest
@@ -4,5 +4,10 @@
 	</request>
 	<assign>
 		<filesystem path="/opt/etc/dump.d/module.d/winsys_log_dump.sh" label="_" exec_label="none" />
+		<filesystem path="/etc/profile.d/Xorg.sh" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf.d/display.conf" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf.d/input.conf" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf.d/module.conf" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf" label="_" exec_label="none" />
 	</assign>
 </manifest>
diff --git a/packaging/xorg-x11-misc-exynos.spec b/packaging/xorg-x11-misc-exynos.spec
index 8bbb861..4e8847f 100644
--- a/packaging/xorg-x11-misc-exynos.spec
+++ b/packaging/xorg-x11-misc-exynos.spec
@@ -2,7 +2,7 @@
 
 Name:	xorg-x11-misc-exynos
 Summary:    X11 X server misc files for exynos
-Version:    0.0.42
+Version:    0.0.56
 Release:    1
 VCS:        magnolia/adaptation/ap_samsung/xserver-xorg-misc-exynos#xorg-x11-misc-exynos-0.0.6-1-47-g27a0e7218c4e5e6ec98ec5801657f371928eba86
 ExclusiveArch:  %arm
@@ -14,19 +14,16 @@ Source1:    xorg.service.wearable
 Source2:    xresources.service.wearable
 Source3:    xscim.service
 %else
+  %if "%{?tizen_profile_name}" == "mobile"
 Source1:    xresources.service.mobile
 Source2:    xresources.path
 Source3:    xorg.service.mobile
+  %endif
 %endif
 
 Requires:   xserver-xorg-core
-Requires:   xorg-x11-drv-evdev-multitouch
 Requires(post):   xkeyboard-config
 
-%if ("%{tizen_profile_name}" == "wearable" && "%{_repository}" == "target-b3")
-Excludearch: %arm
-%endif
-
 %description
 Description: %{summary}
 
@@ -40,7 +37,13 @@ Description: %{summary}
 %if "%{?tizen_profile_name}" == "wearable"
 cd wearable
 %else
+%if "%{?tizen_profile_name}" == "mobile"
 cd mobile
+%else
+%if "%{?tizen_profile_name}" == "tv"
+cd tv
+%endif
+%endif
 %endif
 
 {
@@ -63,7 +66,13 @@ make %{?jobs:-j%jobs}
 %if "%{?tizen_profile_name}" == "wearable"
 cd wearable
 %else
+%if "%{?tizen_profile_name}" == "mobile"
 cd mobile
+%else
+%if "%{?tizen_profile_name}" == "tv"
+cd tv
+%endif
+%endif
 %endif
 
 rm -rf %{buildroot}
@@ -75,6 +84,11 @@ mkdir -p %{buildroot}/etc/rc.d/init.d/
 mkdir -p %{buildroot}/etc/rc.d/rc3.d/
 mkdir -p %{buildroot}/etc/rc.d/rc4.d/
 %endif
+%if "%{?tizen_profile_name}" == "tv"
+mkdir -p %{buildroot}/etc/rc.d/init.d/
+mkdir -p %{buildroot}/etc/rc.d/rc3.d/
+mkdir -p %{buildroot}/etc/rc.d/rc4.d/
+%endif
 mkdir -p %{buildroot}/etc/profile.d/
 mkdir -p %{buildroot}/etc/X11/
 %if "%{?tizen_profile_name}" == "wearable"
@@ -85,7 +99,6 @@ cp -af arm-common/xserver %{buildroot}/etc/rc.d/init.d/
 cp -af arm-common/xresources %{buildroot}/etc/rc.d/init.d/
 %endif
 cp -af arm-common/xsetrc %{buildroot}/etc/X11/
-cp -af arm-common/Xmodmap %{buildroot}/etc/X11/
 cp -af arm-common/xinitrc %{buildroot}/etc/X11/
 %if "%{?tizen_profile_name}" == "wearable"
 cp -af arm-common/winsys_log_dump.sh %{buildroot}/opt/etc/dump.d/module.d
@@ -93,6 +106,10 @@ cp -af arm-common/winsys_log_dump.sh %{buildroot}/opt/etc/dump.d/module.d
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc3.d/S02xserver
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc4.d/S02xserver
 ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc4.d/S80xresources
+%if "%{?tizen_profile_name}" == "tv"
+cp -af arm-common/winsys_log_dump.sh %{buildroot}/usr/bin/
+ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc3.d/S80xresources
+%endif
 %endif
 cp -af arm-common/Xorg.sh %{buildroot}/etc/profile.d/
 %if "%{?tizen_profile_name}" == "wearable"
@@ -105,16 +122,32 @@ ln -s ../xresources.service.wearable %{buildroot}%{_libdir}/systemd/system/multi
 install -m 0644 %SOURCE3 %{buildroot}%{_libdir}/systemd/system/xscim.service
 ln -s ../xscim.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/xscim.service
 %else
+%if "%{?tizen_profile_name}" == "mobile"
 mkdir -p %{buildroot}%{_libdir}/systemd/system/graphical.target.wants
 install -m 0644 %SOURCE3 %{buildroot}%{_libdir}/systemd/system/xorg.service
 mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants/
 install -m 0644 %SOURCE3 %{buildroot}%{_libdir}/systemd/system/basic.target.wants/xorg.service
-install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/xresources.service
-install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/xresources.path
-ln -s ../xresources.path %{buildroot}%{_libdir}/systemd/system/graphical.target.wants/
+%endif
 %endif
 
+%if "%{?tizen_profile_name}" == "tv"
+cp -rf arm-hawk-p/* %{buildroot}/etc/X11/
+%else
 cp -rf arm-e4412/* %{buildroot}/etc/X11/
+%endif
+
+mkdir -p %{buildroot}/opt/var/xkb
+%if "%{?tizen_profile_name}" == "mobile"
+  cp -rf arm-common/tizen_layout_mobile.txt %{buildroot}/opt/var/xkb/tizen_key_layout_temp.txt
+%else
+  %if "%{?tizen_profile_name}" == "wearable"
+    cp -rf arm-common/tizen_layout_wearable.txt %{buildroot}/opt/var/xkb/tizen_key_layout_temp.txt
+  %else
+    %if "%{?tizen_profile_name}" == "tv"
+      cp -rf arm-common/tizen_layout_tv.txt %{buildroot}/opt/var/xkb/tizen_key_layout_temp.txt
+    %endif
+  %endif
+%endif
 
 %post
 mkdir -p /opt/var/log
@@ -123,7 +156,13 @@ mkdir -p /opt/var/log
 %if "%{?tizen_profile_name}" == "wearable"
 %manifest wearable/xorg-x11-misc-exynos.manifest
 %else
+%if "%{?tizen_profile_name}" == "mobile"
 %manifest mobile/xorg-x11-misc-exynos.manifest
+%else
+%if "%{?tizen_profile_name}" == "tv"
+%manifest tv/xorg-x11-misc-hawk-p.manifest
+%endif
+%endif
 %endif
 %defattr(-,root,root,-)
 /usr/share/license/%{name}
@@ -133,30 +172,45 @@ mkdir -p /opt/var/log
 %{_sysconfdir}/rc.d/rc3.d/*
 %{_sysconfdir}/rc.d/rc4.d/*
 %endif
+%if "%{?tizen_profile_name}" == "tv"
+%{_sysconfdir}/rc.d/init.d/*
+%{_sysconfdir}/rc.d/rc3.d/*
+%{_sysconfdir}/rc.d/rc4.d/*
+%endif
+/opt/var/xkb/tizen_key_layout_temp.txt
 %attr(-,inhouse,inhouse)
 /etc/X11/Xresources
 /etc/X11/xinitrc
+%if "%{?tizen_profile_name}" == "tv"
+/usr/bin/winsys_log_dump.sh
+%endif
 /etc/X11/xsetrc
-/etc/X11/Xmodmap
 /etc/X11/xorg.conf
 /etc/X11/xorg.conf.d/*.conf
 %if "%{?tizen_profile_name}" == "wearable"
 /opt/etc/dump.d/module.d/*
 %endif
+
 %{_bindir}/startx
 %if "%{?tizen_profile_name}" == "wearable"
 %{_libdir}/systemd/system/xorg.service
 %{_libdir}/systemd/system/basic.target.wants/xorg.service
 %else
+%if "%{?tizen_profile_name}" == "mobile"
 %{_libdir}/systemd/system/xorg.service
 %{_libdir}/systemd/system/basic.target.wants/xorg.service
 %endif
+%endif
+%if "%{?tizen_profile_name}" == "mobile"
+%endif
+%if "%{?tizen_profile_name}" == "wearable"
 %{_libdir}/systemd/system/xresources.service
+%endif
 %if "%{?tizen_profile_name}" == "wearable"
 %{_libdir}/systemd/system/xscim.service
 %{_libdir}/systemd/system/multi-user.target.wants/xresources.service
 %{_libdir}/systemd/system/multi-user.target.wants/xscim.service
 %else
-%{_libdir}/systemd/system/xresources.path
-%{_libdir}/systemd/system/graphical.target.wants/xresources.path
+%if "%{?tizen_profile_name}" == "mobile"
+%endif
 %endif
diff --git a/packaging/xorg.service.mobile b/packaging/xorg.service.mobile
index 9332200..d331ca3 100644
--- a/packaging/xorg.service.mobile
+++ b/packaging/xorg.service.mobile
@@ -1,7 +1,8 @@
 [Unit]
 Description=xserver
 DefaultDependencies=no
-After=systemd-udev-trigger.service opt.mount smack-default-labeling.service
+Requires=tizen-generate-env.service
+After=systemd-udev-trigger.service opt.mount smack-default-labeling.service tizen-generate-env.service
 
 [Service]
 Type=oneshot
diff --git a/packaging/xorg.service.wearable b/packaging/xorg.service.wearable
index d0226a2..e43a118 100644
--- a/packaging/xorg.service.wearable
+++ b/packaging/xorg.service.wearable
@@ -7,7 +7,6 @@ After=systemd-udev-trigger.service opt.mount smack-default-labeling.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/startx
-EnvironmentFile=-/run/tizen-mobile-env
 
 [Install]
 WantedBy=basic.target
diff --git a/packaging/xresources.service.wearable b/packaging/xresources.service.wearable
index 60f93b9..6a25f16 100644
--- a/packaging/xresources.service.wearable
+++ b/packaging/xresources.service.wearable
@@ -8,8 +8,6 @@ ConditionFileIsExecutable=/usr/bin/xrdb
 Type=oneshot
 EnvironmentFile=/run/tizen-mobile-env
 ExecStart=/usr/bin/xrdb -load -nocpp /etc/X11/Xresources
-ExecStartPost=/bin/mkdir -p /tmp/hibernation
-ExecStartPost=/bin/touch /tmp/hibernation/xresources_ready
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tv/AUTHORS b/tv/AUTHORS
new file mode 100644
index 0000000..ef316d6
--- /dev/null
+++ b/tv/AUTHORS
@@ -0,0 +1,3 @@
+SooChan Lim <sc1.lim@samsung.com>
+Sung-Jin Park <sj76.park@samsung.com>
+Sangjin LEE <lsj119@samsung.com>
diff --git a/tv/COPYING b/tv/COPYING
new file mode 100644
index 0000000..b5aebf0
--- /dev/null
+++ b/tv/COPYING
@@ -0,0 +1,20 @@
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/tv/ChangeLog b/tv/ChangeLog
new file mode 100644
index 0000000..e69de29
diff --git a/tv/INSTALL b/tv/INSTALL
new file mode 100644
index 0000000..8b82ade
--- /dev/null
+++ b/tv/INSTALL
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/tv/LICENSE.MIT b/tv/LICENSE.MIT
new file mode 100644
index 0000000..1c81bdc
--- /dev/null
+++ b/tv/LICENSE.MIT
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Red Hat
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.  Red
+Hat makes no representations about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied
+warranty.
+
+THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/tv/Makefile.am b/tv/Makefile.am
new file mode 100644
index 0000000..f6c30fd
--- /dev/null
+++ b/tv/Makefile.am
@@ -0,0 +1,29 @@
+#  Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+#
+
+bin_SCRIPTS = $(top_srcdir)/@ARCH@-common/startx
+
+confdir = @CONF_PREFIX@/etc/X11
+conf_DATA = $(top_srcdir)/@ARCH@-common/xorg.conf	\
+	    $(top_srcdir)/@ARCH@-common/Xresources
+
+
+
diff --git a/tv/NEWS b/tv/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/tv/NOTICE b/tv/NOTICE
new file mode 100644
index 0000000..c10a9c5
--- /dev/null
+++ b/tv/NOTICE
@@ -0,0 +1,3 @@
+Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under MIT License.
+Please, see the LICENSE.MIT file for MIT License terms and conditions.
diff --git a/tv/README b/tv/README
new file mode 100644
index 0000000..e69de29
diff --git a/tv/arm-common/Xorg.sh b/tv/arm-common/Xorg.sh
new file mode 100644
index 0000000..79a0def
--- /dev/null
+++ b/tv/arm-common/Xorg.sh
@@ -0,0 +1,2 @@
+export HOME=/root
+export DISPLAY=:0
diff --git a/tv/arm-common/Xresources b/tv/arm-common/Xresources
new file mode 100644
index 0000000..032fd26
--- /dev/null
+++ b/tv/arm-common/Xresources
@@ -0,0 +1 @@
+Xft.dpi: 72
diff --git a/tv/arm-common/startx.in b/tv/arm-common/startx.in
new file mode 100644
index 0000000..32a2ac8
--- /dev/null
+++ b/tv/arm-common/startx.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DISPLAY=":0"
+LOGDIR="/var/log"
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d -nolisten tcp "
+OTHER_OPTIONS=" -logfile ${LOGDIR}/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone "
+
+#backup previous Xorg.0.log file
+if [ -e ${LOGDIR}/Xorg.0.log ]; then
+	mv ${LOGDIR}/Xorg.0.log ${LOGDIR}/prev.Xorg.0.log
+fi
+
+#backup previous Xorg.0.log.old file
+if [ -e ${LOGDIR}/Xorg.0.log.old ]; then
+	mv ${LOGDIR}/Xorg.0.log.old ${LOGDIR}/prev.Xorg.0.log.old
+fi
+
+if [ -e ~/.xinitrc ]; then
+	XINITRC=~/.xinitrc
+else
+	XINITRC=/etc/X11/xinitrc
+fi
+
+XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
+
+if [ "$1" = "--gdb" ]; then
+	if [ -x /usr/bin/pvrsrvinit ]; then
+		pvrsrvinit start
+	fi
+	gdb --args Xorg ${XSERVER_OPTIONS}
+else
+	if [ "$1" = "--only" ]; then
+		if [ -x /usr/bin/pvrsrvinit ]; then
+			pvrsrvinit start
+		fi
+
+		Xorg ${XSERVER_OPTIONS} &
+	else
+		xinit ${XINITRC} -- @PREFIX@/bin/Xorg ${XSERVER_OPTIONS} &
+	fi
+fi
+
diff --git a/tv/arm-common/tizen_layout_tv.txt b/tv/arm-common/tizen_layout_tv.txt
new file mode 100644
index 0000000..50793a1
--- /dev/null
+++ b/tv/arm-common/tizen_layout_tv.txt
@@ -0,0 +1,79 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 169
+XF86Home 139
+XF86Back 158
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86QuickPanel 183
+XF86TaskPane 184
+XF86HomePage 172
+XF86WWW 150
+XF86Mail 155
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+Hangul 122 keyboard
+XF86Apps 204
+XF86Call 218
+XF86Game 220
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203
+XF86TV 189
+XF86Display 227
+XF86RCConfig 192
+XF86RCMode 185
+XF86SoftRC 140
+1 2 keyboard
+2 3 keyboard
+3 4 keyboard
+4 5 keyboard
+5 6 keyboard
+6 7 keyboard
+7 8 keyboard
+8 9 keyboard
+9 10 keyboard
+0 11 keyboard
+minus 12 keyboard
+XF86LowerChannel 109
+XF86RaiseChannel 104
+XF86ChannelList 60
+XF86PreviousChannel 182
+XF86SysMenu 139
+XF86SimpleMenu 191
+XF86History 156
+XF86Favorites 190
+Up 103 keyboard
+Down 108 keyboard
+Left 105 keyboard
+Right 106 keyboard
+Return 28 keyboard
+XF86Close 174
+XF86Info 61
+XF86Red 62
+XF86Green 63
+XF86Yellow 64
+XF86Blue 65
+XF86ProgInfo 67
+XF86PictureMode 68
+XF86PictureSize 88
+XF86PIP 66
+XF86Guide 130
+XF86AudioMode 187
+XF86Subtitle 186
+XF863D 188
diff --git a/tv/arm-common/winsys_log_dump.sh b/tv/arm-common/winsys_log_dump.sh
new file mode 100644
index 0000000..6f51fde
--- /dev/null
+++ b/tv/arm-common/winsys_log_dump.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#--------------------------------------
+#   winsys
+#--------------------------------------
+export DISPLAY=:0.0
+WINSYS_DEBUG=$1/winsys
+mkdir -p $WINSYS_DEBUG
+E17_HOME=/home/app
+mkdir -p ${WINSYS_DEBUG}
+xinfo -p 2> ${WINSYS_DEBUG}/ping.log
+xinfo -xwd_topvwins ${WINSYS_DEBUG}
+cp -af /opt/var/log/keygrab_status.txt ${WINSYS_DEBUG}
+xinfo -topvwins 2> ${WINSYS_DEBUG}/xinfo_topvwins.txt
+xdbg clist > ${WINSYS_DEBUG}/xdbg_clist.log 2>&1
+xdbg drmevent_pending > ${WINSYS_DEBUG}/drmevent_pending.log 2>&1
+find /var/log/ -name "*Xorg*" -exec cp {} ${WINSYS_DEBUG}/ \;
+find / -maxdepth 1 -name "*Xorg*" -exec cp -af {} ${WINSYS_DEBUG}/ \;
+xprop -root -f _E_LOG 8s -set _E_LOG ${E17_HOME}/e.log
+cat ${E17_HOME}/e.log > ${WINSYS_DEBUG}/e.log
+border_win_info -p ALL -f ${E17_HOME}/e_illume2.log
+cat ${E17_HOME}/e_illume2.log > ${WINSYS_DEBUG}/e_illume2.log
+e_comp_util -l DUMP_INFO -f ${E17_HOME}/e_comp.log
+cat ${E17_HOME}/e_comp.log > ${WINSYS_DEBUG}/e_comp.log
+rm ${E17_HOME}/e.log
+rm ${E17_HOME}/e_comp.log
+rm ${E17_HOME}/e_illume2.log
diff --git a/tv/arm-common/xinitrc b/tv/arm-common/xinitrc
new file mode 100644
index 0000000..3f9ce40
--- /dev/null
+++ b/tv/arm-common/xinitrc
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+/usr/bin/scim -d &
+
+# set dpi
+if [ -x /usr/bin/xrdb ]; then
+	if [ -e ~/.Xresources ]; then
+		/usr/bin/xrdb -load -nocpp ~/.Xresources
+	else
+		/usr/bin/xrdb -load -nocpp /etc/X11/Xresources
+	fi
+fi
+
+# Copy .e directory if not exist
+export HOME=/opt/home/app
+
+if [ ! -d ${HOME}/.e ]; then
+	cp -rf /opt/home/root/.e ${HOME}/.e
+	chown -R app:app ${HOME}/.e
+fi
+
+su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app
+
diff --git a/tv/arm-common/xorg.conf b/tv/arm-common/xorg.conf
new file mode 100644
index 0000000..53d0b72
--- /dev/null
+++ b/tv/arm-common/xorg.conf
@@ -0,0 +1,6 @@
+Section "ServerFlags"
+	Option "blank time"     "0"
+	Option "standby time"   "0"
+	Option "suspend time"   "0"
+	Option "off time"       "0"
+EndSection
diff --git a/tv/arm-common/xresources b/tv/arm-common/xresources
new file mode 100644
index 0000000..351004b
--- /dev/null
+++ b/tv/arm-common/xresources
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  start|stop|restart|reload|force-reload)
+  # Setting dpi to 72
+    if [ -x /usr/bin/xrdb ]; then
+      if [ -e ~/.Xresources ]; then
+		/usr/bin/xrdb -load -nocpp ~/.Xresources
+      else
+        /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
+      fi
+    fi
+  ;;
+
+  status)
+    if [ -x /usr/bin/xrdb ]; then
+      /usr/bin/xrdb -query -nocpp
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/xresource {start|stop|status|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/tv/arm-common/xserver b/tv/arm-common/xserver
new file mode 100644
index 0000000..40f2667
--- /dev/null
+++ b/tv/arm-common/xserver
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+set -e
+
+export DISPLAY=:0
+export PATH=/bin:/usr/bin/:/sbin:/usr/sbin
+
+case "$1" in
+  start)
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
+    if [ "${is_running}" = "" ]; then                          
+        echo "Starting Xorg server..."
+        /usr/bin/startx
+    else
+        echo "Xorg server is running already..."
+    fi
+  ;;
+
+  restart|reload|force-reload)
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true                
+    if [ "${is_running}" != "" ]; then                                           
+        $0 stop || true
+        sleep 3
+    fi
+    $0 start || true
+  ;;
+
+  stop)
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
+    if [ "${is_running}" != "" ]; then                        
+        echo "Stopping Xorg server..."
+        killall -9 Xorg
+    else
+        echo "Xorg server is not running..."
+    fi
+  ;;
+
+  status)
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
+    if [ "${is_running}" = "" ]; then
+        echo "Xorg server is not running..."
+    else
+        echo "Xorg server is running..."
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/xserver {start|stop|status|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/tv/arm-common/xsetrc b/tv/arm-common/xsetrc
new file mode 100644
index 0000000..e614117
--- /dev/null
+++ b/tv/arm-common/xsetrc
@@ -0,0 +1 @@
+xset -r 123 -r 122 -r 231 -r 177 -r 147 -r 166 -r 225 -r 124 -r 179 -r 220 -r 208 -r 209 -r 174 -r 171 -r 173 -r 176 -r 216 -r 234 &
diff --git a/tv/arm-hawk-p/xorg.conf.d/display.conf b/tv/arm-hawk-p/xorg.conf.d/display.conf
new file mode 100644
index 0000000..45002ae
--- /dev/null
+++ b/tv/arm-hawk-p/xorg.conf.d/display.conf
@@ -0,0 +1,99 @@
+Section "ServerLayout"
+        Identifier              "Test Layout"
+        Screen          0       "Screen0" 0 0
+#	InputDevice		"Gesture"
+EndSection
+
+Section "Screen"
+        Identifier              "Screen0"
+        Device                  "armsoc"
+        Monitor                 "Monitor0"
+        SubSection              "Display"
+        ViewPort			0 0
+	Modes		"960x540@60" "960x540@50" "720x480" "960x1080@50" "960x1080@60" "1920x540@60" "1920x540@50" "1280x1440_60.00" "1280x1440_50.00" "1280x1080@50" "1280x1080@60" "1280x540@50" "1280x540@60" "720x540@50" "720x540@60" "720x576@50" "720x576@60" "720x960@50" "720x960@60" "720x1080@50" "720x1080@60" "960x480@50" "960x480@60" "960x576@50" "960x576@60" "960x720@50" "960x720@60" "960x768@50" "960x768@60" "960x1080@50" "960x1080@60" "1024x540@50" "1024x540@60" "1024x768@50" "1024x768@60" "1024x1080@50" "1024x1080@60" "1280x720@50" "1280x720@60" "1376x1080@50" "1376x1080@60" "1920x480@50" "1920x480@60" "1920x576@50" "1920x576@60" "1920x720@50" "1920x720@50" "1920x768@50" "1920x768@60" "1920x1080@50" "1920x1080@60" "3840x2160@60" "3840x2160@50" "720x1280@50" "720x1280@60" "1080x1920@50" "1080x1920@60" "1920x2160@50" "1920x2160@60" "2560x1080@50" "2560x1080@60" "2560x2160@50" "2560x2160@60" "3840x1080_60.00" "3840x1080_50.00"
+        EndSubSection
+EndSection
+
+Section "Monitor"
+        Identifier              "Monitor0"
+        Option                  "DPMS"  "true"
+#       DisplaySize             46 76
+#	Option 					"PreferredMode" "1280x720@60"
+    Option                  "PreferredMode" "1920x1080@60"
+    ModeLine "720x480" 26.7 720 736 808 896 480 481 484 497
+	Modeline "720x540@50" 24.96 720 752 840 872 540 551 556 568
+	Modeline "720x540@60" 30.69 720 752 864 896 540 551 557 568
+	Modeline "720x576@50" 26.80 720 752 848 880 576 588 593 605
+	Modeline "720x576@60" 33.01 720 752 872 904 576 587 593 605
+	Modeline "720x960@50" 48.93 720 752 936 968 960 980 988 1009
+	Modeline "720x960@60" 61.64 720 752 984 1016 960 979 989 1009
+	Modeline "720x1080@50" 56.72 720 752 960 992 1080 1103 1112 1135
+	Modeline "720x1080@60" 72.03 720 752 1024 1056 1080 1102 1113 1135
+	Modeline "720x1280@50" 70.82 720 752 1016 1048 1280 1307 1318 1345
+	Modeline "720x1280@60" 91.25 720 752 1096 1128 1280 1306 1319 1345
+	Modeline "960x480@50" 28.60 960 992 1096 1128 480 490 494 505
+	Modeline "960x480@60" 35.06 960 992 1120 1152 480 490 495 505
+	ModeLine "960x540@50" 33.2 960 1024 1128 1184 540 552 561 564 -hsync +vsync
+    ModeLine "960x540@60" 40.0 960 1020 1100 1184 540 550 551 563 +hsync +vsync
+	Modeline "960x576@50" 35.00 960 992 1120 1152 576 588 593 605
+	Modeline "960x576@60" 43.12 960 992 1152 1184 576 587 593 605
+	Modeline "960x720@50" 45.27 960 992 1160 1192 720 735 741 757
+	Modeline "960x720@60" 56.21 960 992 1200 1232 720 735 742 757
+	Modeline "960x768@50" 48.80 960 992 1176 1208 768 784 791 807
+	Modeline "960x768@60" 60.76 960 992 1216 1248 768 783 791 807
+    Modeline "960x1080@50" 74.09 960 992 1272 1304 1080 1103 1112 1135
+    Modeline "960x1080@60" 94.08 960 992 1344 1376 1080 1102 1113 1135
+	Modeline "1024x540@50" 34.64 1024 1056 1184 1216 540 551 556 568
+	Modeline "1024x540@60" 42.60 1024 1056 1216 1248 540 551 557 568
+	Modeline "1024x768@50" 51.85 1024 1056 1248 1280 768 784 791 807
+	Modeline "1024x768@60" 64.56 1024 1056 1296 1328 768 783 791 807
+	Modeline "1024x1080@50" 78.72 1024 1056 1352 1384 1080 1103 1112 1135
+	Modeline "1024x1080@60" 99.96 1024 1056 1432 1464 1080 1102 1113 1135
+	Modeline "1080x1920@50" 187.06 1080 1112 1816 1848 1920 1960 1976 2017
+	Modeline "1080x1920@60" 256.32 1080 1112 2080 2112 1920 1959 1978 2017
+	Modeline "1280x540@50" 42.79 1280 1312 1472 1504 540 551 556 568
+    Modeline "1280x540@60" 52.62 1280 1312 1504 1536 540 551 557 568
+	Modeline "1280x720@50" 59.42 1280 1312 1536 1568 720 735 741 757
+	Modeline "1280x720@60" 73.78 1280 1312 1592 1624 720 735 742 757
+	Modeline "1280x1080@50" 97.24 1280 1312 1680 1712 1080 1103 1112 1135
+    Modeline "1280x1080@60" 123.48 1280 1312 1776 1808 1080 1102 1113 1135
+	Modeline "1280x1440_50.00" 128.04 1280 1368 1504 1728 1440 1441 1444 1482 -HSync +Vsync
+	Modeline "1280x1440_60.00" 155.91 1280 1376 1512 1744 1440 1441 1444 1490 -HSync +Vsync
+	Modeline "1376x1080@50" 104.19 1376 1408 1800 1832 1080 1103 1112 1135
+	Modeline "1376x1080@60" 132.30 1376 1408 1904 1936 1080 1102 1113 1135
+    Modeline "1920x480@50" 55.41 1920 1952 2160 2192 480 490 494 505
+    Modeline "1920x480@60" 67.94 1920 1952 2208 2240 480 490 495 505
+    Modeline "1920x540@50" 66.28 1920 1960 2152 2384 540 541 544 556 -HSync +Vsync
+	Modeline "1920x540@60" 81.57 1920 1984 2176 2432 540 541 544 559 -HSync +Vsync
+	Modeline "1920x576@50" 67.81 1920 1952 2208 2240 576 588 593 605
+	Modeline "1920x576@60" 83.54 1920 1952 2264 2296 576 587 593 605
+	Modeline "1920x720@50" 87.71 1920 1952 2280 2312 720 735 741 757
+	Modeline "1920x720@60" 108.91 1920 1952 2360 2392 720 735 742 757
+	Modeline "1920x768@50" 94.55 1920 1952 2304 2336 768 784 791 807
+	Modeline "1920x768@60" 117.73 1920 1952 2392 2424 768 783 791 807
+	Modeline "1920x1080@50" 143.55 1920 1952 2496 2528 1080 1103 1112 1135
+	Modeline "1920x1080@60" 182.28 1920 1952 2640 2672 1080 1102 1113 1135
+	Modeline "1920x2160@50" 395.66 1920 1952 3448 3480 2160 2205 2223 2269
+	Modeline "1920x2160@60" 559.60 1920 1952 4072 4104 2160 2204 2225 2269
+    Modeline "3840x2160@60" 712.34 3840 4152 4576 5312 2160 2161 2164 2235 -HSync +Vsync
+    Modeline "3840x2160@50" 586.61 3840 4136 4560 5280 2160 2161 2164 2222 -HSync +Vsync
+	Modeline "2560x1080@50" 189.85 2560 2592 3312 3344 1080 1103 1112 1135
+    Modeline "2560x1080@60" 241.08 2560 2592 3504 3536 1080 1102 1113 1135
+    Modeline "2560x2160@50" 391.07 2560 2760 3040 3520 2160 2161 2164 2222 -HSync +Vsync
+    Modeline "2560x2160@60" 474.18 2560 2768 3048 3536 2160 2161 2164 2235 -HSync +Vsync
+	Modeline "3840x1080_60.00" 345.60 3840 4080 4496 5152 1080 1081 1084 1118 -HSync +Vsync
+	Modeline "3840x1080_50.00" 282.89 3840 4056 4464 5088 1080 1081 1084 1112 -HSync +Vsync
+
+	Option   	"ExactModeTimingsDVI" "True"
+	Option   	"UseEDIDFreqs" "False"
+EndSection
+
+Section "Device"
+        Identifier              "armsoc"
+        Driver                  "armsoc"
+        Option                  "exa"           "true"
+        Option                  "dri2"          "true"
+        Option                  "sw_exa"        "true"
+        Option                  "tfb"           "true"
+        Option                  "cachable"      "false"
+EndSection
diff --git a/tv/arm-hawk-p/xorg.conf.d/input.conf b/tv/arm-hawk-p/xorg.conf.d/input.conf
new file mode 100644
index 0000000..d907837
--- /dev/null
+++ b/tv/arm-hawk-p/xorg.conf.d/input.conf
@@ -0,0 +1,35 @@
+Section "ServerFlags"
+        Option "AllowEmptyInput" "true"
+        Option "AutoAddDevices" "true"
+        Option "AutoEnableDevices" "true"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchscreen catchall"
+        MatchIsTouchScreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+        Option "MultiTouch"     "3"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+        Option "ProxyDeviceEnabled" "true"
+        Option "event_key_remap" "402=96 403=95 352=104"
+EndSection
+
+Section "InputDevice"
+        Identifier "Gesture"
+        Driver  "gesture"
+        Option  "Device"        "/dev/null"
+EndSection
diff --git a/tv/arm-hawk-p/xorg.conf.d/module.conf b/tv/arm-hawk-p/xorg.conf.d/module.conf
new file mode 100644
index 0000000..dee4acd
--- /dev/null
+++ b/tv/arm-hawk-p/xorg.conf.d/module.conf
@@ -0,0 +1,7 @@
+Section "Module"
+    SubSection  "lazyload"
+        Option  "init_input"   "1"
+        Option  "xdbg"         "log_path,/var/log/Xorg.0.log"
+    EndSubSection
+EndSection
+
diff --git a/tv/autogen.sh b/tv/autogen.sh
new file mode 100644
index 0000000..218197d
--- /dev/null
+++ b/tv/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+#$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/tv/configure.ac b/tv/configure.ac
new file mode 100644
index 0000000..945ceb9
--- /dev/null
+++ b/tv/configure.ac
@@ -0,0 +1,56 @@
+#  Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+#
+
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.61)
+AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
+
+# Checks for programs.
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AC_ARG_WITH(arch,         AS_HELP_STRING([--with-arch=ARCH], [Architecture (default: arm)]),
+                                [ ARCH="$withval" ],
+                                [ ARCH="arm" ])
+AC_ARG_WITH(conf-prefix,      AS_HELP_STRING([--with-conf-prefix=CONF_PREFIX], [Architecture (default: /opt/etc)]),
+                                [ CONF_PREFIX="$withval" ],
+                                [ CONF_PREFIX="/opt/etc" ])
+
+AC_SUBST(ARCH)
+AC_SUBST(CONF_PREFIX)
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/tv/xorg-x11-misc-hawk-p.manifest b/tv/xorg-x11-misc-hawk-p.manifest
new file mode 100644
index 0000000..ba1afee
--- /dev/null
+++ b/tv/xorg-x11-misc-hawk-p.manifest
@@ -0,0 +1,20 @@
+<manifest>
+	<request>
+		<domain name="xorg"/>
+	</request>
+	<assign>
+                <filesystem path="/etc/rc.d/init.d/xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/init.d/xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S02xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S02xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/X11/Xresources" label="_" exec_label="none" />
+                <filesystem path="/usr/bin/winsys_log_dump.sh" label="_" exec_label="none" />
+                <filesystem path="/etc/profile.d/Xorg.sh" label="_" exec_label="none" />
+                <filesystem path="/etc/X11/xorg.conf.d/display.conf" label="_" exec_label="none" />
+                <filesystem path="/etc/X11/xorg.conf.d/input.conf" label="_" exec_label="none" />
+                <filesystem path="/etc/X11/xorg.conf.d/module.conf" label="_" exec_label="none" />
+                <filesystem path="/etc/X11/xorg.conf" label="_" exec_label="none" />
+	</assign>
+</manifest>
diff --git a/wearable/arm-common/Xmodmap b/wearable/arm-common/Xmodmap
deleted file mode 100644
index be42e4b..0000000
--- a/wearable/arm-common/Xmodmap
+++ /dev/null
@@ -1,25 +0,0 @@
-keycode 123 = XF86AudioRaiseVolume
-keycode 122 = XF86AudioLowerVolume
-keycode 231 = Cancel
-keycode 177 = XF86Send
-keycode 147 = XF86Phone
-keycode 166 = XF86Stop
-keycode 225 = XF86Search
-keycode 124 = XF86PowerOff
-keycode 179 = XF86WebCam
-keycode 220 = XF86Pictures
-keycode 208 = XF86AudioPlay
-keycode 209 = XF86AudioPause
-keycode 174 = XF86AudioStop
-keycode 171 = XF86AudioNext
-keycode 173 = XF86AudioPrev
-keycode 176 = XF86AudioRewind
-keycode 216 = XF86AudioForward
-keycode 234 = XF86AudioMedia
-keycode 153 = 
-keycode 239 = 
-keycode 136 = 
-keycode 140 =
-keycode 182 =
-keycode 172 =
-keycode 215 =
diff --git a/wearable/arm-common/Xorg.sh b/wearable/arm-common/Xorg.sh
index 79a0def..b6ff0aa 100755
--- a/wearable/arm-common/Xorg.sh
+++ b/wearable/arm-common/Xorg.sh
@@ -1,2 +1,3 @@
 export HOME=/root
 export DISPLAY=:0
+export XDG_RUNTIME_DIR=/tmp
diff --git a/wearable/arm-common/startx.in b/wearable/arm-common/startx.in
index de26f38..a4bba05 100755
--- a/wearable/arm-common/startx.in
+++ b/wearable/arm-common/startx.in
@@ -2,7 +2,7 @@
 
 DISPLAY=":0"
 LOGDIR="/var/log"
-XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d -nolisten tcp "
 OTHER_OPTIONS=" -logfile ${LOGDIR}/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone "
 
 #run script to enable gl
diff --git a/wearable/arm-common/tizen_layout_wearable.txt b/wearable/arm-common/tizen_layout_wearable.txt
new file mode 100644
index 0000000..66e3480
--- /dev/null
+++ b/wearable/arm-common/tizen_layout_wearable.txt
@@ -0,0 +1,30 @@
+XF86AudioRaiseVolume 115
+XF86AudioLowerVolume 114
+XF86PowerOff 116
+XF86Menu 169
+XF86Home 139
+XF86Back 158
+XF86Camera_Full 212
+XF86Search 217
+XF86AudioPlay 200
+XF86AudioPause 201
+XF86AudioStop 166
+XF86AudioNext 163
+XF86AudioPrev 165
+XF86AudioRewind 168
+XF86AudioForward 208
+XF86AudioMedia 226
+XF86AudioPlayPause 164
+XF86AudioMute 113
+XF86AudioRecord 167
+Cancel 223 keyboard
+XF86SoftKBD 148
+XF86TaskPane 184
+XF86ScreenSaver 152
+XF86MonBrightnessDown 224
+XF86MonBrightnessUp 225
+XF86Voice 149
+XF86Apps 204
+XF86Call 218
+XF86VoiceWakeUp_LPSD 202
+XF86VoiceWakeUp 203
diff --git a/wearable/arm-common/xinitrc b/wearable/arm-common/xinitrc
index f2060e1..16668f8 100755
--- a/wearable/arm-common/xinitrc
+++ b/wearable/arm-common/xinitrc
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-/usr/bin/scim -d &
-
 # set dpi
 if [ -x /usr/bin/xrdb ]; then
 	if [ -e ~/.Xresources ]; then
diff --git a/wearable/arm-common/xresources b/wearable/arm-common/xresources
index 0693afe..351004b 100755
--- a/wearable/arm-common/xresources
+++ b/wearable/arm-common/xresources
@@ -11,8 +11,6 @@ case "$1" in
       else
         /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
       fi
-	  mkdir -p /tmp/hibernation
-	  touch /tmp/hibernation/xresources_ready
     fi
   ;;
 
diff --git a/wearable/arm-e4412/xorg.conf.d/display.conf b/wearable/arm-e4412/xorg.conf.d/display.conf
index bea5873..27c91a9 100755
--- a/wearable/arm-e4412/xorg.conf.d/display.conf
+++ b/wearable/arm-e4412/xorg.conf.d/display.conf
@@ -24,6 +24,8 @@ Section "Device"
         Driver                  "exynos"
         Option                  "exa"           "true"
         Option                  "dri2"          "true"
+        Option                  "dri3"          "true"
+        Option                  "present"       "true"
         Option                  "sw_exa"        "true"
         Option                  "tfb"           "true"
         Option                  "cachable"      "true"
diff --git a/wearable/arm-e4412/xorg.conf.d/input.conf b/wearable/arm-e4412/xorg.conf.d/input.conf
index e6c4be6..56063ed 100755
--- a/wearable/arm-e4412/xorg.conf.d/input.conf
+++ b/wearable/arm-e4412/xorg.conf.d/input.conf
@@ -8,7 +8,7 @@ Section "InputClass"
         Identifier "evdev touchscreen catchall"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
+        Driver "evdev"
         Option "MultiTouch"     "2"
 	Option "Resolution"	"0 319 0 319"
 	Option "SwapAxes"	"off"
diff --git a/wearable/xorg-x11-misc-exynos.manifest b/wearable/xorg-x11-misc-exynos.manifest
index 2c4e9f3..0ffb447 100644
--- a/wearable/xorg-x11-misc-exynos.manifest
+++ b/wearable/xorg-x11-misc-exynos.manifest
@@ -4,5 +4,10 @@
 	</request>
 	<assign>
 		<filesystem path="/opt/etc/dump.d/module.d/winsys_log_dump.sh" label="_" exec_label="none" />
+		<filesystem path="/etc/profile.d/Xorg.sh" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf.d/display.conf" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf.d/input.conf" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf.d/module.conf" label="_" exec_label="none" />
+		<filesystem path="/etc/X11/xorg.conf" label="_" exec_label="none" />
 	</assign>
 </manifest>
diff --git a/wearable/xresources.service b/wearable/xresources.service
index 60f93b9..6a25f16 100644
--- a/wearable/xresources.service
+++ b/wearable/xresources.service
@@ -8,8 +8,6 @@ ConditionFileIsExecutable=/usr/bin/xrdb
 Type=oneshot
 EnvironmentFile=/run/tizen-mobile-env
 ExecStart=/usr/bin/xrdb -load -nocpp /etc/X11/Xresources
-ExecStartPost=/bin/mkdir -p /tmp/hibernation
-ExecStartPost=/bin/touch /tmp/hibernation/xresources_ready
 
 [Install]
 WantedBy=multi-user.target