| Message ID | 1499771839-32518-6-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 07/11/2017 08:17 AM, Peter Maydell wrote: > Add the CMSDK APB timers to the MPS2 board. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/arm/mps2.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c > index 1b60b12..b1a0df9 100644 > --- a/hw/arm/mps2.c > +++ b/hw/arm/mps2.c > @@ -33,6 +33,7 @@ > #include "sysemu/sysemu.h" > #include "hw/misc/unimp.h" > #include "hw/char/cmsdk-apb-uart.h" > +#include "hw/timer/cmsdk-apb-timer.h" > > typedef enum MPS2FPGAType { > FPGA_AN385, > @@ -294,6 +295,9 @@ static void mps2_common_init(MachineState *machine) > g_assert_not_reached(); > } > > + cmsdk_apb_timer_create(0x40000000, qdev_get_gpio_in(armv7m, 8), SYSCLK_FRQ); > + cmsdk_apb_timer_create(0x40001000, qdev_get_gpio_in(armv7m, 9), SYSCLK_FRQ); > + > system_clock_scale = NANOSECONDS_PER_SECOND / SYSCLK_FRQ; > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, >
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index 1b60b12..b1a0df9 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -33,6 +33,7 @@ #include "sysemu/sysemu.h" #include "hw/misc/unimp.h" #include "hw/char/cmsdk-apb-uart.h" +#include "hw/timer/cmsdk-apb-timer.h" typedef enum MPS2FPGAType { FPGA_AN385, @@ -294,6 +295,9 @@ static void mps2_common_init(MachineState *machine) g_assert_not_reached(); } + cmsdk_apb_timer_create(0x40000000, qdev_get_gpio_in(armv7m, 8), SYSCLK_FRQ); + cmsdk_apb_timer_create(0x40001000, qdev_get_gpio_in(armv7m, 9), SYSCLK_FRQ); + system_clock_scale = NANOSECONDS_PER_SECOND / SYSCLK_FRQ; armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
Add the CMSDK APB timers to the MPS2 board. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/arm/mps2.c | 4 ++++ 1 file changed, 4 insertions(+)