# HG changeset patch
# User Lukasz Forynski <lukasz.forynski@gmail.com>
# Date 1284136301 -3600
# Node ID 43baf257831d770fbc439edec0ff133f6d5fe333
# Parent  11c1b624035252671d5a589fbee5882b1bb10e4d# Parent  52c8fa16282d700bd9a40f421430d16b4eb2f86d
merged with latest default

diff -r 52c8fa16282d -r 43baf257831d omap3530/beagleboard/rom/base_beagle.iby
--- a/omap3530/beagleboard/rom/base_beagle.iby	Thu Sep 09 19:48:41 2010 +0100
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Fri Sep 10 17:31:41 2010 +0100
@@ -144,4 +144,9 @@
 extension[VARID]=	\epoc32\release\ARMV5\BUILD_DIR\_beagle_usbv.dll					\sys\bin\usbv.DLL
 #endif
 
-//extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll	\sys\bin\ekeyb.dll
\ No newline at end of file
+//extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll	\sys\bin\ekeyb.dll
+
+#ifdef USE_VT100_DISPLAY
+#include <../omapshared/edisp_vt100.iby>
+#endif
+
diff -r 52c8fa16282d -r 43baf257831d omap3530/beagleboard/rom/kernel.iby
--- a/omap3530/beagleboard/rom/kernel.iby	Thu Sep 09 19:48:41 2010 +0100
+++ b/omap3530/beagleboard/rom/kernel.iby	Fri Sep 10 17:31:41 2010 +0100
@@ -85,4 +85,8 @@
 #	include <rom\##VARIANT##\test.iby>
 #endif
 
+#ifdef USE_VT100_DISPLAY
+#include <rom/omapshared/edisp_vt100.iby>
+#endif
 
+
diff -r 52c8fa16282d -r 43baf257831d omap3530/bld.inf
--- a/omap3530/bld.inf	Thu Sep 09 19:48:41 2010 +0100
+++ b/omap3530/bld.inf	Fri Sep 10 17:31:41 2010 +0100
@@ -38,6 +38,7 @@
 #include "shared/mstick/bld.inf"
 #include "shared/serialkeyb/bld.inf"
 #include "shared/tps65950/bld.inf"
+#include "shared/edisp_vt100/bld.inf"
 
 // Build image armv5 for urel and udeb
 PRJ_EXTENSIONS
diff -r 52c8fa16282d -r 43baf257831d omap3530/shared/edisp_vt100/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omap3530/shared/edisp_vt100/bld.inf	Fri Sep 10 17:31:41 2010 +0100
@@ -0,0 +1,22 @@
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_MMPFILES
+../../../../../os/kernelhwsrv/kernel/eka/drivers/edisp/edisp_vt100.mmp
+
+PRJ_EXPORTS
+edisp_vt100.iby   /epoc32/rom/omapshared/
+
diff -r 52c8fa16282d -r 43baf257831d omap3530/shared/edisp_vt100/edisp_vt100.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omap3530/shared/edisp_vt100/edisp_vt100.iby	Fri Sep 10 17:31:41 2010 +0100
@@ -0,0 +1,14 @@
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+//
+// Contributors:
+//
+// Description:
+//
+
+file=\Epoc32\Release\##MAIN##\##BUILD##\edisp_vt100.dll \sys\bin\edisp_vt100.dll
\ No newline at end of file