# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1279296978 -3600
# Node ID 4508ea692a4d0be75618d9ead72575c387ddaeab
# Parent  d1a826faf80bc61995f2753f03e5f9b96f8af1f6# Parent  7bf4e70b6d9ea7da95873b6bd064794e553f7321
Merge

diff -r 7bf4e70b6d9e -r 4508ea692a4d omap3530/beagle_drivers/lcd/bld.inf
--- a/omap3530/beagle_drivers/lcd/bld.inf	Fri Jul 16 16:19:24 2010 +0100
+++ b/omap3530/beagle_drivers/lcd/bld.inf	Fri Jul 16 17:16:18 2010 +0100
@@ -18,3 +18,4 @@
 
 PRJ_MMPFILES
 lcd
+lcd_gce
diff -r 7bf4e70b6d9e -r 4508ea692a4d omap3530/beagle_drivers/lcd/lcd_gce.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omap3530/beagle_drivers/lcd/lcd_gce.mmp	Fri Jul 16 17:16:18 2010 +0100
@@ -0,0 +1,58 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// beagle/beagle_drivers/lcd.mmp
+// lcd.dll Beagle LCD driver
+//
+
+
+
+/**
+ @file
+*/
+#define __USING_ASSP_REGISTER_API__
+#define __USING_ASSP_INTERRUPT_API__
+
+#include			"beagle/variant.mmh"
+#include			"kernel/kern_ext.mmh"
+
+//Need to define NGA_BUILD for a NGA compliant Display PDD
+#define NGA_BUILD
+#ifdef NGA_BUILD
+MACRO ENABLE_GCE_MODE
+target				VariantTarget(lcd_gce,dll)
+#else
+target				VariantTarget(lcd,dll)
+#endif
+
+targettype			kext
+romtarget			lcd.dll
+
+sourcepath			.
+source				lcd.cpp
+
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
+userinclude			.
+
+library			VariantTarget(ecust,lib)
+LIBRARY         AsspTarget(prcm,lib)
+
+noexportlibrary
+
+epocallowdlldata
+
+uid					0x1000008d 0x100039e8
+
+VENDORID 0x70000001
+
+capability			all
diff -r 7bf4e70b6d9e -r 4508ea692a4d omap3530/beagleboard/rom/base_beagle.iby
--- a/omap3530/beagleboard/rom/base_beagle.iby	Fri Jul 16 16:19:24 2010 +0100
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Fri Jul 16 17:16:18 2010 +0100
@@ -128,7 +128,6 @@
 			extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
 		#endif
 	#endif
-#endif //SYMBIAN_BASE_USE_GCE
 
 extension[VARID]=KERNEL_DIR\BUILD_DIR\elocd.ldd								\sys\bin\elocd.ldd
 extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_medint.pdd					\sys\bin\medint.pdd
@@ -141,6 +140,7 @@
 device[VARID]=	KERNEL_DIR\BUILD_DIR\usbc.ldd							\sys\bin\eusbc.ldd
 extension[VARID]=	\epoc32\release\ARMV5\BUILD_DIR\_beagle_usbv.dll					\sys\bin\usbv.DLL
 #endif
+#endif //SYMBIAN_BASE_USE_GCE
 
 //extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll	\sys\bin\ekeyb.dll
 //extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
\ No newline at end of file