Move around platform/runner/board, lowering nesting complexity

solokeys · Feb 26, 2021 · 4e8a83d · 4e8a83d
1 parent 1f3102a
commit 4e8a83d
Show file tree

Hide file tree

Showing 39 changed files with 19 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
-RUNNER := platforms/lpc55/runner
+RUNNER := runners/lpc55
+
 build-dev:
 	make -C $(RUNNER) build-dev
 

diff --git a/README.md b/README.md
@@ -24,15 +24,16 @@ Install [Rust and Cargo](https://www.rust-lang.org/tools/install) for your syste
 
 ### Boards
 
-Head to [platforms/lpc55/board](platforms/lpc55/board) for an overview on the possible embedded platforms the firmware
+Head to [runnners/lpc55/board](runners/lpc55/board) for an overview on the possible embedded platforms the firmware
 currently supports.
 
 ### Compiling
 
-Head to [platforms/lpc55/runner](platforms/lpc55/runner) to get started, and try `make build-dev`, which compiles
+Head to [runners/lpc55](runners/lpc55) to get started, and try `make build-dev`, which compiles
 the entire firmware bundle using features convenient for getting started.
 
 With `make run-dev`, it will try to connect to a GDB server to flash and run the firmware.
+One way to run a GDB server is `JLinkGDBServer -strict -device LPC55S69 -if SWD -vd`
 
 To enable logs, you can change the feature flags on each crate.  Then logs will be output via semihosting to your SWD debugger.
 ```

diff --git a/platforms/lpc55/runner/.cargo/config → runners/lpc55/.cargo/config b/platforms/lpc55/runner/.cargo/config → runners/lpc55/.cargo/config
diff --git a/platforms/lpc55/runner/.gitignore → runners/lpc55/.gitignore b/platforms/lpc55/runner/.gitignore → runners/lpc55/.gitignore
diff --git a/platforms/lpc55/runner/Cargo.toml → runners/lpc55/Cargo.toml b/platforms/lpc55/runner/Cargo.toml → runners/lpc55/Cargo.toml
@@ -28,22 +28,22 @@ usbd-serial = "0.1.0"
 trussed = { git = "https://github.com/trussed-dev/trussed", branch = "main", features = ["clients-3"] }
 
 # board
-board = { path = "../board" }
+board = { path = "board" }
 
 # components
-apdu-dispatch = {path = "../../../components/apdu-dispatch"}
-applet-fido = {path = "../../../components/applet-fido"}
-applet-ndef = {path = "../../../components/applet-ndef"}
-applet-root = {path = "../../../components/applet-root"}
-c-stubs = { path = "../../../components/c-stubs" }
-ctap-types = { path = "../../../components/ctap-types" }
-fido-authenticator = { path = "../../../components/fido-authenticator" }
-fm11nc08 = {path = "../../../components/fm11nc08"}
-hid-dispatch = {path = "../../../components/hid-dispatch"}
-iso14443 = {path = "../../../components/iso14443"}
-piv-authenticator = { path = "../../../components/piv-authenticator", features = ["applet"] }
-usbd-ccid = { path = "../../../components/usbd-ccid" }
-usbd-ctaphid = { path = "../../../components/usbd-ctaphid" }
+apdu-dispatch = {path = "../../components/apdu-dispatch"}
+applet-fido = {path = "../../components/applet-fido"}
+applet-ndef = {path = "../../components/applet-ndef"}
+applet-root = {path = "../../components/applet-root"}
+c-stubs = { path = "../../components/c-stubs" }
+ctap-types = { path = "../../components/ctap-types" }
+fido-authenticator = { path = "../../components/fido-authenticator" }
+fm11nc08 = {path = "../../components/fm11nc08"}
+hid-dispatch = {path = "../../components/hid-dispatch"}
+iso14443 = {path = "../../components/iso14443"}
+piv-authenticator = { path = "../../components/piv-authenticator", features = ["applet"] }
+usbd-ccid = { path = "../../components/usbd-ccid" }
+usbd-ctaphid = { path = "../../components/usbd-ctaphid" }
 
 # panic
 panic-halt = "0.2.0"

diff --git a/platforms/lpc55/runner/Makefile → runners/lpc55/Makefile b/platforms/lpc55/runner/Makefile → runners/lpc55/Makefile
diff --git a/platforms/lpc55/runner/bacon.toml → runners/lpc55/bacon.toml b/platforms/lpc55/runner/bacon.toml → runners/lpc55/bacon.toml
diff --git a/platforms/lpc55/board/.cargo/config → runners/lpc55/board/.cargo/config b/platforms/lpc55/board/.cargo/config → runners/lpc55/board/.cargo/config
diff --git a/platforms/lpc55/board/Cargo.toml → runners/lpc55/board/Cargo.toml b/platforms/lpc55/board/Cargo.toml → runners/lpc55/board/Cargo.toml
diff --git a/platforms/lpc55/board/README.md → runners/lpc55/board/README.md b/platforms/lpc55/board/README.md → runners/lpc55/board/README.md
diff --git a/...forms/lpc55/board/src/clock_controller.rs → runners/lpc55/board/src/clock_controller.rs b/...forms/lpc55/board/src/clock_controller.rs → runners/lpc55/board/src/clock_controller.rs
diff --git a/platforms/lpc55/board/src/lib.rs → runners/lpc55/board/src/lib.rs b/platforms/lpc55/board/src/lib.rs → runners/lpc55/board/src/lib.rs
diff --git a/platforms/lpc55/board/src/lpcxpresso55.rs → runners/lpc55/board/src/lpcxpresso55.rs b/platforms/lpc55/board/src/lpcxpresso55.rs → runners/lpc55/board/src/lpcxpresso55.rs
diff --git a/...s/lpc55/board/src/lpcxpresso55/.gitignore → ...s/lpc55/board/src/lpcxpresso55/.gitignore b/...s/lpc55/board/src/lpcxpresso55/.gitignore → ...s/lpc55/board/src/lpcxpresso55/.gitignore
diff --git a/...ms/lpc55/board/src/lpcxpresso55/button.rs → ...rs/lpc55/board/src/lpcxpresso55/button.rs b/...ms/lpc55/board/src/lpcxpresso55/button.rs → ...rs/lpc55/board/src/lpcxpresso55/button.rs
diff --git a/...forms/lpc55/board/src/lpcxpresso55/led.rs → runners/lpc55/board/src/lpcxpresso55/led.rs b/...forms/lpc55/board/src/lpcxpresso55/led.rs → runners/lpc55/board/src/lpcxpresso55/led.rs
diff --git a/platforms/lpc55/board/src/nfc.rs → runners/lpc55/board/src/nfc.rs b/platforms/lpc55/board/src/nfc.rs → runners/lpc55/board/src/nfc.rs
diff --git a/platforms/lpc55/board/src/solov2.rs → runners/lpc55/board/src/solov2.rs b/platforms/lpc55/board/src/solov2.rs → runners/lpc55/board/src/solov2.rs
diff --git a/platforms/lpc55/board/src/solov2/.gitignore → runners/lpc55/board/src/solov2/.gitignore b/platforms/lpc55/board/src/solov2/.gitignore → runners/lpc55/board/src/solov2/.gitignore
diff --git a/platforms/lpc55/board/src/solov2/button.rs → runners/lpc55/board/src/solov2/button.rs b/platforms/lpc55/board/src/solov2/button.rs → runners/lpc55/board/src/solov2/button.rs
diff --git a/platforms/lpc55/board/src/solov2/led.rs → runners/lpc55/board/src/solov2/led.rs b/platforms/lpc55/board/src/solov2/led.rs → runners/lpc55/board/src/solov2/led.rs
diff --git a/platforms/lpc55/board/src/traits.rs → runners/lpc55/board/src/traits.rs b/platforms/lpc55/board/src/traits.rs → runners/lpc55/board/src/traits.rs
diff --git a/platforms/lpc55/board/src/traits/buttons.rs → runners/lpc55/board/src/traits/buttons.rs b/platforms/lpc55/board/src/traits/buttons.rs → runners/lpc55/board/src/traits/buttons.rs
diff --git a/platforms/lpc55/board/src/traits/rgb_led.rs → runners/lpc55/board/src/traits/rgb_led.rs b/platforms/lpc55/board/src/traits/rgb_led.rs → runners/lpc55/board/src/traits/rgb_led.rs
diff --git a/platforms/lpc55/board/src/traits/timer.rs → runners/lpc55/board/src/traits/timer.rs b/platforms/lpc55/board/src/traits/timer.rs → runners/lpc55/board/src/traits/timer.rs
diff --git a/platforms/lpc55/board/src/trussed.rs → runners/lpc55/board/src/trussed.rs b/platforms/lpc55/board/src/trussed.rs → runners/lpc55/board/src/trussed.rs
diff --git a/platforms/lpc55/runner/build.rs → runners/lpc55/build.rs b/platforms/lpc55/runner/build.rs → runners/lpc55/build.rs
diff --git a/platforms/lpc55/runner/jlink.gdb → runners/lpc55/jlink.gdb b/platforms/lpc55/runner/jlink.gdb → runners/lpc55/jlink.gdb
diff --git a/platforms/lpc55/runner/pyocd.gdb → runners/lpc55/pyocd.gdb b/platforms/lpc55/runner/pyocd.gdb → runners/lpc55/pyocd.gdb
diff --git a/platforms/lpc55/runner/pyocd.yaml → runners/lpc55/pyocd.yaml b/platforms/lpc55/runner/pyocd.yaml → runners/lpc55/pyocd.yaml
diff --git a/platforms/lpc55/runner/src/lib.rs → runners/lpc55/src/lib.rs b/platforms/lpc55/runner/src/lib.rs → runners/lpc55/src/lib.rs
diff --git a/platforms/lpc55/runner/src/main.rs → runners/lpc55/src/main.rs b/platforms/lpc55/runner/src/main.rs → runners/lpc55/src/main.rs
diff --git a/platforms/lpc55/runner/src/types.rs → runners/lpc55/src/types.rs b/platforms/lpc55/runner/src/types.rs → runners/lpc55/src/types.rs
diff --git a/platforms/lpc55/runner/src/types/usb.rs → runners/lpc55/src/types/usb.rs b/platforms/lpc55/runner/src/types/usb.rs → runners/lpc55/src/types/usb.rs
diff --git a/platforms/lpc55/runner/tail-serial.py → runners/lpc55/tail-serial.py b/platforms/lpc55/runner/tail-serial.py → runners/lpc55/tail-serial.py
diff --git a/platforms/pc/.cargo/config → runners/pc/.cargo/config b/platforms/pc/.cargo/config → runners/pc/.cargo/config
diff --git a/platforms/pc/Cargo.toml → runners/pc/Cargo.toml b/platforms/pc/Cargo.toml → runners/pc/Cargo.toml
diff --git a/platforms/pc/src/app_pc.rs → runners/pc/src/app_pc.rs b/platforms/pc/src/app_pc.rs → runners/pc/src/app_pc.rs
diff --git a/platforms/pc/src/lib.rs → runners/pc/src/lib.rs b/platforms/pc/src/lib.rs → runners/pc/src/lib.rs