# HG changeset patch # User Lukasz Forynski # Date 1284676175 -3600 # Node ID adda5b1bc98e5e44f13f15d5b6a964ad90043c59 # Parent dc96bdfcaddc8caffb272caddb13934ec38dece1 fixed rombuild problems caused by identation changes in 70:ed23a53a5ee2 - probably rom requires #ifdefs at the beggining of line - otherwise it puts them to rom.oby file diff -r dc96bdfcaddc -r adda5b1bc98e omap3530/beagleboard/rom/base_beagle.iby --- a/omap3530/beagleboard/rom/base_beagle.iby Thu Sep 16 23:05:40 2010 +0100 +++ b/omap3530/beagleboard/rom/base_beagle.iby Thu Sep 16 23:29:35 2010 +0100 @@ -105,22 +105,22 @@ #include <../omapshared/tps65950.iby> #ifdef SYMBIAN_BASE_USE_GCE - // Use the new GCE compliant display driver +// 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 extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard_uisoftkeys.dll \sys\bin\ekeyb.dll #else - #ifdef TSHELL_SERIAL - //Use VT100 Over Serial - #define EDISP_DRV \EDISP_VT100.DLL - #else - 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 - extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll - #endif - #endif +#ifdef TSHELL_SERIAL +//Use VT100 Over Serial +#define EDISP_DRV \EDISP_VT100.DLL +#else + 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 + extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll +#endif +#endif #endif //SYMBIAN_BASE_USE_GCE device[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_EUART.PDD \sys\bin\euart.pdd diff -r dc96bdfcaddc -r adda5b1bc98e omap3530/beagleboard/rom/kernel.iby --- a/omap3530/beagleboard/rom/kernel.iby Thu Sep 16 23:05:40 2010 +0100 +++ b/omap3530/beagleboard/rom/kernel.iby Thu Sep 16 23:29:35 2010 +0100 @@ -48,19 +48,19 @@ device[VARID]=\Epoc32\Release\ARMV5\##BUILD##\ECOMM.LDD \sys\bin\ecomm.ldd #ifdef TSHELL_SERIAL - //Use VT100 Over Serial - # define EDISP_DRV \EDISP_VT100.DLL +//Use VT100 Over Serial +#define EDISP_DRV \EDISP_VT100.DLL #else extension[VARID]= \epoc32\release\ARMV5\##BUILD##\_##VARIANT##_lcd.dll \sys\bin\lcd.dll - #ifdef SERIALMOUSE - #ifdef BASE_ROM - extension[VARID]= \epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse_tshell.DLL \sys\bin\eserialmouse.dll - #else - extension[VARID]= \epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse.DLL \sys\bin\eserialmouse.dll - #endif - #else - extension[VARID]= \epoc32\release\ARMV5\##BUILD##\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll - #endif +#ifdef SERIALMOUSE +#ifdef BASE_ROM + extension[VARID]= \epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse_tshell.DLL \sys\bin\eserialmouse.dll +#else + extension[VARID]= \epoc32\release\ARMV5\##BUILD##\_##VARIANT##_serialmouse.DLL \sys\bin\eserialmouse.dll +#endif +#else + extension[VARID]= \epoc32\release\ARMV5\##BUILD##\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll +#endif #endif file[VARID]= \epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_EKDATA.DLL \sys\bin\ekdata.dll @@ -81,5 +81,5 @@ #define EUSER_DLL ../../ARMV5/##BUILD##/_omap3530_euser.dll #ifdef TEST_ROM -# include +#include #endif