# HG changeset patch # User Lukasz Forynski # Date 1284136301 -3600 # Node ID 43baf257831d770fbc439edec0ff133f6d5fe333 # Parent 11c1b624035252671d5a589fbee5882b1bb10e4d# Parent 52c8fa16282d700bd9a40f421430d16b4eb2f86d merged with latest default diff -r 11c1b6240352 -r 43baf257831d omap3530/beagleboard/rom/base_beagle.iby --- a/omap3530/beagleboard/rom/base_beagle.iby Fri Sep 10 17:28:00 2010 +0100 +++ b/omap3530/beagleboard/rom/base_beagle.iby Fri Sep 10 17:31:41 2010 +0100 @@ -115,7 +115,6 @@ // Use the new GCE compliant display driver extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll \sys\bin\lcd.dll device[VARID]=KERNEL_DIR\DEBUG_DIR\display.ldd \sys\bin\display0.ldd - #file=ABI_DIR\DEBUG_DIR\_beagle_ekdata.dll \sys\bin\ekdata.dll extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard_uisoftkeys.dll \sys\bin\ekeyb.dll #else #ifdef TSHELL_SERIAL diff -r 11c1b6240352 -r 43baf257831d omap3530/beagleboard/rom/kernel.iby --- a/omap3530/beagleboard/rom/kernel.iby Fri Sep 10 17:28:00 2010 +0100 +++ b/omap3530/beagleboard/rom/kernel.iby Fri Sep 10 17:31:41 2010 +0100 @@ -47,6 +47,8 @@ #include +device[VARID]=\Epoc32\Release\ARMV5\##BUILD##\_omap3530_EUART.PDD \sys\bin\euart.pdd +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 diff -r 11c1b6240352 -r 43baf257831d omap3530/shared/monitor/monitor.cpp --- a/omap3530/shared/monitor/monitor.cpp Fri Sep 10 17:28:00 2010 +0100 +++ b/omap3530/shared/monitor/monitor.cpp Fri Sep 10 17:31:41 2010 +0100 @@ -28,6 +28,9 @@ { Omap3530Uart::TUart uart( portNumber ); + // wait for uart to fihish any transmission that could be started (i.e. crash info) + while(!uart.TxFifoEmpty()); + // Ensure UART clocks are running Prcm::SetClockState( uart.PrcmInterfaceClk(),Prcm::EClkOn ); Prcm::SetClockState( uart.PrcmFunctionClk(), Prcm::EClkOn ); @@ -50,7 +53,7 @@ Omap3530Uart::TUart uart( portNumber ); TUint c=0; - + while ( !uart.RxFifoEmpty() ) { if ( CheckPower() )