diff --git a/base/include/platform/rpi/drivers/board_base.h b/base/include/platform/rpi/drivers/board_base.h index c6a48e0c6e..d01ea64a11 100644 --- a/base/include/platform/rpi/drivers/board_base.h +++ b/base/include/platform/rpi/drivers/board_base.h @@ -48,6 +48,9 @@ namespace Genode IRQ_CONTROLLER_BASE = 0x2000b200, IRQ_CONTROLLER_SIZE = 0x100, + /* timer */ + TIMER_IRQ = 0, + SECURITY_EXTENSION = 0, /* CPU cache */ diff --git a/os/src/drivers/timer/hw/rpi/platform_timer_base.h b/os/src/drivers/timer/hw/rpi/platform_timer_base.h index f67ac68727..f55de5ad32 100644 --- a/os/src/drivers/timer/hw/rpi/platform_timer_base.h +++ b/os/src/drivers/timer/hw/rpi/platform_timer_base.h @@ -17,6 +17,7 @@ /* Genode includes */ #include #include +#include /* * On the BCM2835, the timer is driven by the APB clock (250 MHz). The prescale @@ -27,8 +28,7 @@ * we open an IO_MEM session with a range smaller than page size as argument. * The dataspace base address will correspond to 0x2000b000. */ -enum { TIMER_IRQ = 0, - TIMER_MMIO_BASE = 0x2000b400, +enum { TIMER_MMIO_BASE = 0x2000b400, TIMER_MMIO_OFFSET = 0x400, TIMER_MMIO_SIZE = 0x100, TIMER_CLOCK = 1984*1000 }; @@ -38,7 +38,7 @@ struct Platform_timer_base Genode::Attached_io_mem_dataspace, Genode::Sp804_base { - enum { IRQ = TIMER_IRQ }; + enum { IRQ = Genode::Board_base::TIMER_IRQ }; Platform_timer_base() : Attached_io_mem_dataspace(TIMER_MMIO_BASE, TIMER_MMIO_SIZE),