From ff91dd7baa0c8fe5a7d73a201416e77768a104af Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 13 Dec 2020 02:29:35 +0100
Subject: [PATCH] Cargo.toml: obtain sfkv and stm32f4xx-hal via git

---
 Cargo.lock | 23 ++++++++++++-----------
 Cargo.toml | 13 +++----------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59a8aa8..be02f64 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -127,9 +127,9 @@ dependencies = [
 
 [[package]]
 name = "cortex-m-semihosting"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "113ef0ecffee2b62b58f9380f4469099b30e9f9cbee2804771b4203ba1762cfa"
+checksum = "6bffa6c1454368a6aa4811ae60964c38e6996d397ff8095a8b9211b1c1f749bc"
 dependencies = [
  "cortex-m",
 ]
@@ -282,9 +282,9 @@ checksum = "4e20e6499bbbc412f280b04a42346b356c6fa0753d5fd22b7bd752ff34c778ee"
 
 [[package]]
 name = "panic-semihosting"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aed16eb761d0ee9161dd1319cb38c8007813b20f9720a5a682b283e7b8cdfe58"
+checksum = "c3d55dedd501dfd02514646e0af4d7016ce36bc12ae177ef52056989966a1eec"
 dependencies = [
  "cortex-m",
  "cortex-m-semihosting",
@@ -363,9 +363,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
 dependencies = [
  "serde_derive",
 ]
@@ -382,9 +382,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -394,6 +394,7 @@ dependencies = [
 [[package]]
 name = "sfkv"
 version = "0.1.0"
+source = "git+https://git.m-labs.hk/m-labs/sfkv.git#08262fc3e943dab8c6faa112dc313c9a245fce03"
 dependencies = [
  "byteorder",
  "postcard",
@@ -445,6 +446,7 @@ dependencies = [
 [[package]]
 name = "stm32f4xx-hal"
 version = "0.8.3"
+source = "git+https://github.com/astro/stm32f4xx-hal.git?branch=flash#45d804dce0cd72733767b4647ab9369a2f169a70"
 dependencies = [
  "bare-metal 0.2.5",
  "cast",
@@ -452,7 +454,6 @@ dependencies = [
  "cortex-m-rt",
  "embedded-dma",
  "embedded-hal",
- "log",
  "nb 0.1.3",
  "rand_core",
  "stm32f4",
@@ -462,9 +463,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.48"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
+checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 35c31d2..d6cf080 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,18 +36,11 @@ eeprom24x = "0.3"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 heapless = "0.5"
 serde-json-core = "0.1"
-sfkv = "0.1"
+sfkv = { git = "https://git.m-labs.hk/m-labs/sfkv.git" }
 
 [patch.crates-io]
-# smoltcp = { path = "../smoltcp" }
-# # TODO: pending https://github.com/stm32-rs/stm32f4xx-hal/pull/125
-# stm32f4xx-hal = { git = "https://github.com/thalesfragoso/stm32f4xx-hal", branch = "pwm-impl" }
-#stm32f4xx-hal = { git = "https://github.com/stm32-rs/stm32f4xx-hal.git" }
-stm32f4xx-hal = { path = "../../stm32f4/stm32f4xx-hal" }
-sfkv = { path = "../sfkv" }
-
-# [patch."https://github.com/stm32-rs/stm32-eth.git"]
-# stm32-eth = { path = "../../stm32f4/stm32-eth" }
+# TODO: pending https://github.com/stm32-rs/stm32f4xx-hal/pull/239
+stm32f4xx-hal = { git = "https://github.com/astro/stm32f4xx-hal.git", branch = "flash" }
 
 [features]
 semihosting = ["panic-semihosting", "cortex-m-log/semihosting"]