# HG changeset patch
# User Lukasz Forynski <lukasz.forynski@gmail.com>
# Date 1288799917 0
# Node ID 8d4b9216c0cdcd3dc9682ea6fc2f1c5b60f76c9b
# Parent  adda5b1bc98e5e44f13f15d5b6a964ad90043c59# Parent  e34b5496f1f6444b8cf7f1b2355767be611e82d4
catch-up from default

diff -r adda5b1bc98e -r 8d4b9216c0cd omap3530/beagle_drivers/hal/values.hda
--- a/omap3530/beagle_drivers/hal/values.hda	Thu Sep 16 23:29:35 2010 +0100
+++ b/omap3530/beagle_drivers/hal/values.hda	Wed Nov 03 15:58:37 2010 +0000
@@ -3,7 +3,7 @@
 EManufacturerSoftwareRev=0
 EManufacturerSoftwareBuild=0
 EModel=0
-EMachineUid=0
+EMachineUid=0x10286F79
 EDeviceFamily=crystal
 EDeviceFamilyRev=0
 ECPU=arm
diff -r adda5b1bc98e -r 8d4b9216c0cd omap3530/beagle_drivers/lcd/lcd.cpp
--- a/omap3530/beagle_drivers/lcd/lcd.cpp	Thu Sep 16 23:29:35 2010 +0100
+++ b/omap3530/beagle_drivers/lcd/lcd.cpp	Wed Nov 03 15:58:37 2010 +0000
@@ -1498,7 +1498,7 @@
 			iLdd->iDisplayInfo.iPixelFormat = EUidPixelFormatRGB_888;
 			break;
 		case 32:
-			iLdd->iDisplayInfo.iPixelFormat = EUidPixelFormatARGB_8888;
+			iLdd->iDisplayInfo.iPixelFormat = EUidPixelFormatXRGB_8888;
 			break;
 		default:
 			iLdd->iDisplayInfo.iPixelFormat = EUidPixelFormatUnknown;
diff -r adda5b1bc98e -r 8d4b9216c0cd omap3530/beagle_drivers/medstaticrd/beagle_medstaticrd.cpp
--- a/omap3530/beagle_drivers/medstaticrd/beagle_medstaticrd.cpp	Thu Sep 16 23:29:35 2010 +0100
+++ b/omap3530/beagle_drivers/medstaticrd/beagle_medstaticrd.cpp	Wed Nov 03 15:58:37 2010 +0000
@@ -19,7 +19,7 @@
 
 #include "locmedia.h"
 #include "platform.h"
-#include "\sf\adaptation\beagleboard\omap3530\beagleboard\inc\variantmediadef.h"
+#include "\sf\adapt\beagleboard\omap3530\beagleboard\inc\variantmediadef.h"
 #include "beagle_medstaticrd.h"
 //#include "syborg.h"
 
diff -r adda5b1bc98e -r 8d4b9216c0cd omap3530/beagleboard/rom/base_beagle.iby
--- a/omap3530/beagleboard/rom/base_beagle.iby	Thu Sep 16 23:29:35 2010 +0100
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Wed Nov 03 15:58:37 2010 +0000
@@ -17,7 +17,8 @@
 // check that "rom -v=beagle -i=armv5" still builds                 *
 //
 
-
+#ifndef __BASE_BEAGLE_IBY__
+#define __BASE_BEAGLE_IBY__
 
 #ifdef _FULL_DEBUG
 #ifndef _DEBUG
@@ -108,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
@@ -142,3 +147,5 @@
 #endif
 
 //extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll	\sys\bin\ekeyb.dll
+
+#endif
\ No newline at end of file
diff -r adda5b1bc98e -r 8d4b9216c0cd omap3530/beagleboard/rom/kernel.iby
--- a/omap3530/beagleboard/rom/kernel.iby	Thu Sep 16 23:29:35 2010 +0100
+++ b/omap3530/beagleboard/rom/kernel.iby	Wed Nov 03 15:58:37 2010 +0000
@@ -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,15 +58,23 @@
 #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
 extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_MEDINT.PDD				\sys\bin\medint.pdd
 
+// Persistent storage
+extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_medstaticrd.pdd	    	\sys\bin\medstaticrd.pdd
+
+// Estart
+data=               	\epoc32\rom\beagle\estart.txt					    \sys\data\estart.txt
+
 // Uncommnet to include West Bridge Astoria Symbian Storage driver 
 //extension[VARID]=	\epoc32\release\ARMV5\##BUILD##\_##VARIANT##_MEDWB.PDD				\sys\bin\medwb.pdd
 device[VARID]=		\epoc32\release\##KMAIN##\##BUILD##\PIPELIB.LDD							\sys\bin\pipelib.ldd
diff -r adda5b1bc98e -r 8d4b9216c0cd omap3530/shared/tps65950/tps65950.iby
--- a/omap3530/shared/tps65950/tps65950.iby	Thu Sep 16 23:29:35 2010 +0100
+++ b/omap3530/shared/tps65950/tps65950.iby	Wed Nov 03 15:58:37 2010 +0000
@@ -16,10 +16,12 @@
 
 #ifdef BASE_TEXT_SHELL_BUILD
 
+// This line is used for lernelhwsrvkernel\eka\rom.pl - it does not work for "buildrom" or iMaker
 extension[0x09080001]=    \Epoc32\Release\ARMV5\##BUILD##\tps65950.dll 			\sys\bin\tps65950.dll
 
 #else
 
-extension[VARID]=\epoc32\release\ARMV5\UDEB\tps65950.dll				\sys\bin\tps65950.dll
+// This line is used for buildrom and iMaker.
+extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\tps65950.dll				\sys\bin\tps65950.dll
 
-#endif
\ No newline at end of file
+#endif
diff -r adda5b1bc98e -r 8d4b9216c0cd package_definition.xml
--- a/package_definition.xml	Thu Sep 16 23:29:35 2010 +0100
+++ b/package_definition.xml	Wed Nov 03 15:58:37 2010 +0000
@@ -14,3 +14,4 @@
     </collection>
   </package>
 </SystemDefinition>
+