From 0d2e03a5a91607ba133518023c1adeb3069d7084 Mon Sep 17 00:00:00 2001
From: Nicolas Stalder <n@stalder.io>
Date: Sun, 17 Feb 2019 02:28:52 +0100
Subject: [PATCH] Change firmware-hacker ROP level, add ST DFU udev

- later we can set ROP=1 for hacker firmware builds again,
  right now it causes issues in solo-python tool
---
 99-solo.rules              | 5 ++++-
 targets/stm32l432/Makefile | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/99-solo.rules b/99-solo.rules
index 9a78a00..1301cb7 100644
--- a/99-solo.rules
+++ b/99-solo.rules
@@ -10,9 +10,12 @@ LABEL="mm_usb_device_blacklist_end"
 
 # Solo
 
-## access
+## bootloader + firmware access
 ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", TAG+="uaccess", GROUP="plugdev"
 
+## DFU access
+ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess", GROUP="plugdev"
+
 ## Solo Secure symlink
 SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", ATTRS{product}=="Solo [1-9]*", SYMLINK+="solokey"
 ## Solo Hacker symlink
diff --git a/targets/stm32l432/Makefile b/targets/stm32l432/Makefile
index 4bbf516..0ac5843 100644
--- a/targets/stm32l432/Makefile
+++ b/targets/stm32l432/Makefile
@@ -13,7 +13,7 @@ merge_hex=../../tools/solotool.py mergehex
 # The following are the main targets for reproducible builds.
 # TODO: better explanation
 firmware-hacker:
-	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=0 EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=1'
+	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=0 EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'
 
 firmware-secure:
 	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=0 EXTRA_DEFINES='-DUSE_SOLOKEYS_CERT -DFLASH_ROP=2'