Merge branch 'release/v1.5.1' into main

nrf-rs · May 19, 2021 · 5f6b143 · 5f6b143
2 parents 0840c1b + f2e353f
commit 5f6b143
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -6,4 +6,4 @@ rustflags = [
 ]
 
 [build]
-target = "thumbv8m.main-none-eabi" # Cortex-M33
+target = "thumbv8m.main-none-eabihf" # Cortex-M33 Hard Float
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nrfxlib-sys"
-version = "1.4.2"
+version = "1.5.1"
 authors = [
 	"Jonathan 'theJPster' Pallant <github@thejpster.org.uk>",
 	"42 Technology Ltd <jonathan.pallant@42technology.com>",
@@ -9,23 +9,24 @@ edition = "2018"
 description = "Rust bindings to the Nordic nRF9160 Socket Library."
 readme = "README.md"
 license-file = "LICENCE.md"
-repository = "https://github.com/thejpster/nrfxlib-sys"
+repository = "https://github.com/42-technology-ltd/nrfxlib-sys"
+resolver = "2"
 # The nrfxlib folder is quite large, so only include the pieces we need
 include = [
 	"src/**",
 	"include/**",
 	"build.rs",
 	"wrapper.h",
 	"*.md",
-	"third_party/nordic/nrfxlib/bsdlib/lib/cortex-m33/soft-float/**",
-	"third_party/nordic/nrfxlib/bsdlib/include/**",
-	"third_party/nordic/nrfxlib/bsdlib/license.txt",
-	"third_party/nordic/nrfxlib/bsdlib/README.rst",
+	"third_party/nordic/nrfxlib/nrf_modem/lib/cortex-m33/hard-float/**",
+	"third_party/nordic/nrfxlib/nrf_modem/include/**",
+	"third_party/nordic/nrfxlib/nrf_modem/license.txt",
+	"third_party/nordic/nrfxlib/nrf_modem/README.rst",
 	"third_party/nordic/nrfxlib/crypto/nrf_cc310_platform/include/**",
 	"third_party/nordic/nrfxlib/crypto/nrf_cc310_platform/license.txt",
 	"third_party/nordic/nrfxlib/crypto/nrf_cc310_mbedcrypto/include/**",
 	"third_party/nordic/nrfxlib/crypto/nrf_cc310_mbedcrypto/license.txt",
-	"third_party/nordic/nrfxlib/crypto/nrf_oberon/lib/cortex-m33/soft-float/**",
+	"third_party/nordic/nrfxlib/crypto/nrf_oberon/lib/cortex-m33/hard-float/**",
 	"third_party/nordic/nrfxlib/crypto/nrf_oberon/include/**",
 	"third_party/nordic/nrfxlib/crypto/nrf_oberon/license.txt",
 ]

diff --git a/build.rs b/build.rs
@@ -81,15 +81,15 @@ fn main() {
 	println!(
 		"cargo:rustc-link-search={}",
 		Path::new(&nrfxlib_path)
-			.join("bsdlib/lib/cortex-m33/soft-float")
+			.join("nrf_modem/lib/cortex-m33/hard-float")
 			.display()
 	);
 	println!(
 		"cargo:rustc-link-search={}",
 		Path::new(&nrfxlib_path)
-			.join("crypto/nrf_oberon/lib/cortex-m33/soft-float")
+			.join("crypto/nrf_oberon/lib/cortex-m33/hard-float")
 			.display()
 	);
-	println!("cargo:rustc-link-lib=static=bsd_nrf9160_xxaa");
-	println!("cargo:rustc-link-lib=static=oberon_3.0.7");
+	println!("cargo:rustc-link-lib=static=modem");
+	println!("cargo:rustc-link-lib=static=oberon_3.0.8");
 }
diff --git a/third_party/nordic/nrfxlib b/third_party/nordic/nrfxlib
diff --git a/wrapper.h b/wrapper.h
@@ -5,12 +5,13 @@
 /*
  * libbsd headers
  */
-#include "bsdlib/include/bsd.h"
-#include "bsdlib/include/bsd_limits.h"
-#include "bsdlib/include/bsd_os.h"
-#include "bsdlib/include/bsd_platform.h"
-#include "bsdlib/include/nrf_errno.h"
-#include "bsdlib/include/nrf_socket.h"
+#include "nrf_modem/include/nrf_modem.h"
+#include "nrf_modem/include/nrf_modem_limits.h"
+#include "nrf_modem/include/nrf_modem_full_dfu.h"
+#include "nrf_modem/include/nrf_modem_os.h"
+#include "nrf_modem/include/nrf_modem_platform.h"
+#include "nrf_modem/include/nrf_errno.h"
+#include "nrf_modem/include/nrf_socket.h"
 
 /*
  * Crypto Cell 310 (CC310) platform headers
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ rustflags = [ @@
     ]
     [build]
-    target = "thumbv8m.main-none-eabi" # Cortex-M33
+    target = "thumbv8m.main-none-eabihf" # Cortex-M33 Hard Float