# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1269975019 -3600
# Node ID fc9fa34e0c9efb8eb069f9bb86e85b265f27ee3e
# Parent  b8b0521c95b2e201a30383a4e0c168c22d268035# Parent  0dfaca43d90e46629a17fdcd58760051fb0df0f3
Catchup merge

diff -r 0dfaca43d90e -r fc9fa34e0c9e baseport/syborg/bld.inf
--- a/baseport/syborg/bld.inf	Wed Mar 24 13:46:59 2010 +0900
+++ b/baseport/syborg/bld.inf	Tue Mar 30 19:50:19 2010 +0100
@@ -20,7 +20,8 @@
 
 PRJ_EXPORTS
 syborg.oby						/epoc32/rom/include/	//
-base.iby						/epoc32/rom/include/	//
+//MattD - don't export the base.iby as you end up fighting with the kernel and everyone else...
+//base.iby						/epoc32/rom/include/	//
 rom/base_syborg.iby				/epoc32/rom/include/	//
 rom/header.iby					/epoc32/rom/syborg/		//
 rom/kernel.iby					/epoc32/rom/syborg/		//
diff -r 0dfaca43d90e -r fc9fa34e0c9e baseport/syborg/rom/base_syborg.iby
--- a/baseport/syborg/rom/base_syborg.iby	Wed Mar 24 13:46:59 2010 +0900
+++ b/baseport/syborg/rom/base_syborg.iby	Tue Mar 30 19:50:19 2010 +0100
@@ -136,7 +136,7 @@
 
 file=ABI_DIR\DEBUG_DIR\KEYMAP_FILE.dll	\sys\bin\ekdata.dll
 
-#define	SCDV_DLL        _PLATFORM_NAME_scdv.dll
+#define	SCDV_DLL        _generic_scdv.dll
 #define	EUSER_DLL	_PLATFORM_NAME_euser.dll
 
 device[VARID] 	=KERNEL_DIR\DEBUG_DIR\pipelib.ldd		\sys\bin\pipelib.ldd
diff -r 0dfaca43d90e -r fc9fa34e0c9e baseport/syborg/syborg.oby
--- a/baseport/syborg/syborg.oby	Wed Mar 24 13:46:59 2010 +0900
+++ b/baseport/syborg/syborg.oby	Tue Mar 30 19:50:19 2010 +0100
@@ -41,8 +41,11 @@
 
 define ROMMEGS			50		/* !! HEX !! */
 define PLATFORM_NAME		syborg
+#define BASEPORT_DRV <base_syborg.iby>
+#define COLOR
+#undef SYMBIAN_EXCLUDE_SCDV
 
-#define COLOR
+
 
 REM defines for IrDA options
 REM Uncomment the line below to enable IrDA to use a Jeteye ESI09680 pod with serial card adapter