Merge branch 'dev-v2.2.0' into hugoender-patch-1

.githooks/pre-commit

@@ -2,6 +2,12 @@
 # SPDX-FileCopyrightText: 2021 Foundation Devices, Inc. <[email protected]>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+branch=`git symbolic-ref HEAD`
+if [ "$branch" = "refs/heads/main" ] || [[ "$branch" == refs/heads/dev-v* ]]; then
+    echo "Direct commits to the main and dev branches are not allowed."
+    exit 1
+fi
+
 RESULTS=$(find . -name '*.py' -exec grep -H fake_it[\ ]*=[\ ]*True {} +)
 LEN=`expr length "$RESULTS"`
 echo $RESULTS

DEVELOPMENT.md

@@ -40,7 +40,6 @@ Then run the following commands:
     rustup target add aarch64-unknown-none 
 
     rustup target add thumbv7em-none-eabihf
-    rustup target add x86_64-unknown-none
     cargo install cbindgen
 
 #### Cross-Compiler Toolchain
@@ -161,5 +160,9 @@ To build the bootloader for a reproducibility check, go to the repo root folder:
 
 Then run one of the following commands to build the corresponding bootloader:
 
-    just build color
-    just build mono
+    just build-bootloader color
+    just build-bootloader mono
+
+Please note that building the mono bootloader is not yet supported in this repository.  If you need to build it, please follow the instructions at:
+
+https://github.com/Foundation-Devices/passport-firmware

Dockerfile

@@ -40,9 +40,7 @@ ENV PATH="/cargo/bin:${PATH}"
 # Finish installation of Rust toolchain.
 RUN rustup component add clippy && \
     rustup component add rustfmt && \
-    rustup target add aarch64-unknown-none && \
-    rustup target add thumbv7em-none-eabihf && \
-    rustup target add x86_64-unknown-none
+    rustup target add thumbv7em-none-eabihf
 
 # Install binaries using cargo.
 RUN cargo install cbindgen@^0.24 && \