diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/cpu.h b/repos/base-hw/src/core/include/spec/cortex_a9/cpu.h index 861bd9d91..07ce35890 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a9/cpu.h +++ b/repos/base-hw/src/core/include/spec/cortex_a9/cpu.h @@ -215,9 +215,6 @@ class Genode::Cpu : public Arm_v7 enum { - /* common */ - PERIPH_CLK = Board::CORTEX_A9_CLOCK, - /* interrupt controller */ PL390_DISTRIBUTOR_MMIO_BASE = Board::CORTEX_A9_PRIVATE_MEM_BASE + 0x1000, PL390_DISTRIBUTOR_MMIO_SIZE = 0x1000, @@ -228,7 +225,6 @@ class Genode::Cpu : public Arm_v7 PRIVATE_TIMER_MMIO_BASE = Board::CORTEX_A9_PRIVATE_MEM_BASE + 0x600, PRIVATE_TIMER_MMIO_SIZE = 0x10, PRIVATE_TIMER_IRQ = 29, - PRIVATE_TIMER_CLK = PERIPH_CLK }; /** diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/timer.h b/repos/base-hw/src/core/include/spec/cortex_a9/timer.h index 22a02e4a3..9b233ddc1 100644 --- a/repos/base-hw/src/core/include/spec/cortex_a9/timer.h +++ b/repos/base-hw/src/core/include/spec/cortex_a9/timer.h @@ -27,7 +27,7 @@ namespace Genode */ class Timer : public Mmio { - enum { TICS_PER_MS = Cpu::PRIVATE_TIMER_CLK / 1000, }; + enum { TICS_PER_MS = Board::CORTEX_A9_PRIVATE_TIMER_CLK / 1000 }; /** * Load value register diff --git a/repos/base/include/platform/panda/drivers/board_base.h b/repos/base/include/platform/panda/drivers/board_base.h index ff2410888..c6cfa3a5a 100644 --- a/repos/base/include/platform/panda/drivers/board_base.h +++ b/repos/base/include/platform/panda/drivers/board_base.h @@ -34,8 +34,7 @@ namespace Genode RAM_0_SIZE = 0x40000000, /* clocks */ - MPU_DPLL_CLOCK = 200*1000*1000, - SYS_CLK = 38400000, + SYS_CLK = 38400000, /* UART controllers */ TL16C750_1_MMIO_BASE = MMIO_0_BASE + 0x6a000, @@ -58,7 +57,7 @@ namespace Genode /* CPU */ CORTEX_A9_PRIVATE_MEM_BASE = 0x48240000, CORTEX_A9_PRIVATE_MEM_SIZE = 0x00002000, - CORTEX_A9_CLOCK = MPU_DPLL_CLOCK, + CORTEX_A9_PRIVATE_TIMER_CLK = 350000000, /* L2 cache */ PL310_MMIO_BASE = 0x48242000, diff --git a/repos/base/include/platform/pbxa9/drivers/board_base.h b/repos/base/include/platform/pbxa9/drivers/board_base.h index fadc0c141..ec025e873 100644 --- a/repos/base/include/platform/pbxa9/drivers/board_base.h +++ b/repos/base/include/platform/pbxa9/drivers/board_base.h @@ -44,12 +44,11 @@ namespace Genode /* clocks */ OSC_6_CLOCK = 24*1000*1000, - OSC_7_CLOCK = 14*1000*1000, /* CPU */ - CORTEX_A9_CLOCK = OSC_7_CLOCK * 5, - CORTEX_A9_PRIVATE_MEM_BASE = 0x1f000000, - CORTEX_A9_PRIVATE_MEM_SIZE = 0x01000000, + CORTEX_A9_PRIVATE_TIMER_CLK = 100000000, + CORTEX_A9_PRIVATE_MEM_BASE = 0x1f000000, + CORTEX_A9_PRIVATE_MEM_SIZE = 0x01000000, /* UART */ PL011_0_MMIO_BASE = 0x10009000, diff --git a/repos/base/include/platform/vea9x4/drivers/board_base.h b/repos/base/include/platform/vea9x4/drivers/board_base.h index de7e0e4c6..a82752cf8 100644 --- a/repos/base/include/platform/vea9x4/drivers/board_base.h +++ b/repos/base/include/platform/vea9x4/drivers/board_base.h @@ -65,9 +65,6 @@ namespace Genode PL180_0_IRQ = 9, PL180_1_IRQ = 10, - /* clocks */ - TCREF_CLOCK = 66670*1000, - /* TrustZone Address Space Controller */ TZASC_MMIO_BASE = 0x100ec000, TZASC_MMIO_SIZE = 0x1000, @@ -77,9 +74,9 @@ namespace Genode TZPC_MMIO_SIZE = 0x1000, /* CPU */ - CORTEX_A9_PRIVATE_MEM_BASE = 0x1e000000, - CORTEX_A9_PRIVATE_MEM_SIZE = 0x2000, - CORTEX_A9_CLOCK = TCREF_CLOCK, + CORTEX_A9_PRIVATE_MEM_BASE = 0x1e000000, + CORTEX_A9_PRIVATE_MEM_SIZE = 0x2000, + CORTEX_A9_PRIVATE_TIMER_CLK = 200010000, /* wether board provides security extension */ SECURITY_EXTENSION = 1,