On 2019-01-23 22:22, Stefan Hajnoczi wrote:
> From: Steffen Görtz <cont...@steffen-goertz.de>
>
> Signed-off-by: Steffen Görtz <cont...@steffen-goertz.de>
> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
> ---
> tests/microbit-test.c | 97 +++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 97 insertions(+)
>
> diff --git a/tests/microbit-test.c b/tests/microbit-test.c
> index 0c125535f6..d3edd38643 100644
> --- a/tests/microbit-test.c
> +++ b/tests/microbit-test.c
> @@ -20,8 +20,104 @@
>
> #include "hw/arm/nrf51.h"
> #include "hw/gpio/nrf51_gpio.h"
> +#include "hw/nvram/nrf51_nvm.h"
> #include "hw/timer/nrf51_timer.h"
>
> +#define FLASH_SIZE (256 * NRF51_PAGE_SIZE)
> +
> +static void fill_and_erase(hwaddr base, hwaddr size, uint32_t address_reg)
> +{
> + hwaddr i;
> +
> + /* Erase Page */
> + writel(NRF51_NVMC_BASE + NRF51_NVMC_CONFIG, 0x02);
> + writel(NRF51_NVMC_BASE + address_reg, base);
> + writel(NRF51_NVMC_BASE + NRF51_NVMC_CONFIG, 0x00);
I think you might have a conflict here with Julia's patch
"tests/microbit-test: Make test independent of global_qtest". Could you
please have a look (and e.g. include Julia's patches in your series)?
Thanks,
Thomas
