From 51e7da292a69d646de743e49b519555ef9406c4f Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Fri, 28 Aug 2020 22:28:06 +0200
Subject: [PATCH] boards: nrf52_bsim: Use simplified nrf_bsim_models

The simplified bsim implementation reuses nrfx directly instead
of using manually modified header files.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
---
 boards/posix/nrf52_bsim/board_soc.h | 3 +--
 west.yml                            | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/boards/posix/nrf52_bsim/board_soc.h b/boards/posix/nrf52_bsim/board_soc.h
index 3ea35cdb6c1..e5c904eb7cc 100644
--- a/boards/posix/nrf52_bsim/board_soc.h
+++ b/boards/posix/nrf52_bsim/board_soc.h
@@ -28,9 +28,8 @@
 #include <stddef.h>
 #include "irq.h"
 #include "irq_sources.h"
-#include "NRF_regs.h"
+#include <nrfx.h>
 #include "cmsis.h"
-#include "nrf_soc_if.h"
 
 #define OFFLOAD_SW_IRQ SWI0_EGU0_IRQn
 
diff --git a/west.yml b/west.yml
index b0153f5f66a..cdb80c6897e 100644
--- a/west.yml
+++ b/west.yml
@@ -56,7 +56,7 @@ manifest:
       revision: f1fa8241f8786198ba41155413243de36ed878a5
       path: modules/hal/infineon
     - name: hal_nordic
-      revision: 0f4ff90fbf8137086e2f9c1b78a6fc2aa5ef731f
+      revision: fc12f5e2b47cf143254234c05f9ecbdb603a7101
       path: modules/hal/nordic
     - name: hal_openisa
       revision: 40d049f69c50b58ea20473bee14cf93f518bf262
@@ -130,7 +130,7 @@ manifest:
       revision: 957d46bc3ce0d5f628f0d525196bb4db207672ee
     - name: nrf_hw_models
       path: modules/bsim_hw_models/nrf_hw_models
-      revision: f86079a7333968f0ba71fe1266e241295a4e9943
+      revision: 71a8a9ef086d57ff5f3974138b0951f24c2017ad
     - name: hal_xtensa
       revision: e7a57d0c252f9c5f3cab9d5ceadda8753cacee5b
       path: modules/hal/xtensa