ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove 'epit' from generic i.MX platform spec 

Remove the 'epit' variable from the generic imx31 and imx53 specification,
and only add it to base-hw specific i.MX specs. Thereby the EPIT timer
library gets build for base-hw only.
Moreover, fix some const-ness issues in the platform_timer implementation
for the EPIT timer.
Fixes #688.
This commit is contained in:
Stefan Kalkowski 2013-03-14 10:50:09 +01:00 committed by Norman Feske
parent 0f38335188
commit ce58a63fb6
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base-hw/mk/spec-hw_imx31.mk
View File

@ -5,7 +5,7 @@
#
# denote wich specs are also fullfilled by this spec
SPECS += hw platform_imx31
SPECS += hw platform_imx31 epit
# set address where to link the text segment at
LD_TEXT_ADDR ?= 0x82000000

2
base-hw/mk/spec-hw_imx53.mk
View File

@ -5,7 +5,7 @@
#
# denote wich specs are also fullfilled by this spec
SPECS += hw platform_imx53
SPECS += hw platform_imx53 epit
# set address where to link the text segment at
LD_TEXT_ADDR ?= 0x70001000

2
base/mk/spec-platform_imx31.mk
View File

@ -5,7 +5,7 @@
#
# denote wich specs are also fullfilled by this spec
SPECS += arm_v6 epit
SPECS += arm_v6
# add repository relative include paths
REP_INC_DIR += include/platform/imx31

2
base/mk/spec-platform_imx53.mk
View File

@ -5,7 +5,7 @@
#
# denote wich specs are also fullfilled by this spec
SPECS += cortex_a8 imx53 imx epit
SPECS += cortex_a8 imx53 imx
# add repository relative include paths
REP_INC_DIR += include/platform/imx53

7
os/src/drivers/timer/hw/epit/platform_timer_base.h
View File

@ -59,13 +59,12 @@ namespace Genode
/**
* Maximum timeout value
*/
unsigned long max_value() {
return read<Lr>(); }
unsigned long max_value() const { return read<Lr>(); }
/**
* Translate timer tics to microseconds
*/
unsigned long tics_to_us(unsigned long const tics)
unsigned long tics_to_us(unsigned long const tics) const
{
float const us = tics * us_per_tic();
return (unsigned long)us;
@ -83,7 +82,7 @@ namespace Genode
/**
* Sample the timer counter and according wrapped status
*/
unsigned long value(bool & wrapped)
unsigned long value(bool & wrapped) const
{
unsigned long v = read<Cnt>();
wrapped = (bool)read<Sr::Ocif>();