# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1286913234 -3600
# Node ID f6cd2532cd9b2bc35fde559f48a718248fd23a0a
# Parent  cf5d4fe2473f65670ccef8f2f83952424538b4c4
Bug 3818 - Beagle baseport doesn't define a machineuid
Bug 3819 - No way of excluding serial keyboard driver from beagle rom build

diff -r cf5d4fe2473f -r f6cd2532cd9b omap3530/beagle_drivers/hal/values.hda
--- a/omap3530/beagle_drivers/hal/values.hda	Tue Oct 12 16:44:01 2010 +0100
+++ b/omap3530/beagle_drivers/hal/values.hda	Tue Oct 12 20:53:54 2010 +0100
@@ -3,7 +3,7 @@
 EManufacturerSoftwareRev=0
 EManufacturerSoftwareBuild=0
 EModel=0
-EMachineUid=0
+EMachineUid=0x10286F79
 EDeviceFamily=crystal
 EDeviceFamilyRev=0
 ECPU=arm
diff -r cf5d4fe2473f -r f6cd2532cd9b omap3530/beagleboard/rom/base_beagle.iby
--- a/omap3530/beagleboard/rom/base_beagle.iby	Tue Oct 12 16:44:01 2010 +0100
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Tue Oct 12 20:53:54 2010 +0100
@@ -109,19 +109,23 @@
 // Use the new GCE compliant display driver  
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll	\sys\bin\lcd.dll
 	device[VARID]=\epoc32\release\ARMV5\BUILD_DIR\display.ldd			\sys\bin\display0.ldd
+#ifndef EXCLUDE_SERIALKEYBOARD
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard_uisoftkeys.dll	\sys\bin\ekeyb.dll
+#endif
 #else
 #ifdef TSHELL_SERIAL
 //Use VT100 Over Serial
 #define EDISP_DRV	\EDISP_VT100.DLL
-#else
+#else // not TSHELL_SERIAL
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd.dll				\sys\bin\lcd.dll
 #ifdef TSHELL_SERIALMOUSE
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_serialmouse.DLL	\sys\bin\eserialmouse.dll
 #else
+#ifndef EXCLUDE_SERIALKEYBOARD
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
-#endif
-#endif
+#endif // EXCLUDE_SERIALKEYBOARD
+#endif // TSHELL_SERIALMOUSE
+#endif // TSHELL_SERIAL
 #endif //SYMBIAN_BASE_USE_GCE
 
 device[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_EUART.PDD				\sys\bin\euart.pdd
diff -r cf5d4fe2473f -r f6cd2532cd9b omap3530/beagleboard/rom/kernel.iby
--- a/omap3530/beagleboard/rom/kernel.iby	Tue Oct 12 16:44:01 2010 +0100
+++ b/omap3530/beagleboard/rom/kernel.iby	Tue Oct 12 20:53:54 2010 +0100
@@ -50,7 +50,7 @@
 #ifdef TSHELL_SERIAL
 //Use VT100 Over Serial
 #define EDISP_DRV	\EDISP_VT100.DLL
-#else
+#else // not TSHELL_SERIAL
 	extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_lcd.dll				\sys\bin\lcd.dll
 #ifdef SERIALMOUSE
 #ifdef BASE_ROM
@@ -58,10 +58,12 @@
 #else
 	extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse.DLL		\sys\bin\eserialmouse.dll
 #endif
-#else
+#else // not SERIALMOUSE
+#ifndef EXCLUDE_SERIALKEYBOARD
 	extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_omap3530_serialkeyboard.DLL	\sys\bin\ekeyb.dll
 #endif
 #endif
+#endif
 
 file[VARID]=		\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_EKDATA.DLL				\sys\bin\ekdata.dll
 extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\ELOCD.LDD							\sys\bin\elocd.ldd