From 16bfdddbac04182b8cc8d384ff2c77ef14e31028 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Thu, 9 Mar 2023 23:21:14 -0500
Subject: [PATCH 1/9] nerves_system_br: bump to v1.22.4

---
 .circleci/config.yml | 2 +-
 mix.exs              | 2 +-
 mix.lock             | 9 +++++----
 test/mix.lock        | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c27c20..6fc5ecb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 exec: &exec
   name: build-tools/nerves-system-br
-  version: 1.22.3
+  version: 1.22.4
   elixir: 1.14.3-otp-25
 
 version: 2.1
diff --git a/mix.exs b/mix.exs
index 5220e7c..768f45a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -67,7 +67,7 @@ defmodule NervesSystemRpi4.MixProject do
   defp deps do
     [
       {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.15 or ~> 1.8", runtime: false},
-      {:nerves_system_br, "1.22.3", runtime: false},
+      {:nerves_system_br, "1.22.4", runtime: false},
       {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.8.0", runtime: false},
       {:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
       {:ex_doc, "~> 0.22", only: :docs, runtime: false}
diff --git a/mix.lock b/mix.lock
index 17b8a5d..82c6880 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,13 +1,14 @@
 %{
   "castore": {:hex, :castore, "0.1.22", "4127549e411bedd012ca3a308dede574f43819fe9394254ca55ab4895abfa1a2", [:mix], [], "hexpm", "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.30", "0b938aa5b9bafd455056440cdaa2a79197ca5e693830b4a982beada840513c5f", [:mix], [], "hexpm", "3b5385c2d36b0473d0b206927b841343d25adb14f95f0110062506b300cd5a1b"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.31", "a93921cdc6b9b869f519213d5bc79d9e218ba768d7270d46fdcf1c01bacff9e2", [:mix], [], "hexpm", "317d367ee0335ef037a87e46c91a2269fef6306413f731e8ec11fc45a7efd059"},
   "elixir_make": {:hex, :elixir_make, "0.7.5", "784cc00f5fa24239067cc04d449437dcc5f59353c44eb08f188b2b146568738a", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "c3d63e8d5c92fa3880d89ecd41de59473fa2e83eeb68148155e25e8b95aa2887"},
-  "ex_doc": {:hex, :ex_doc, "0.29.1", "b1c652fa5f92ee9cf15c75271168027f92039b3877094290a75abcaac82a9f77", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "b7745fa6374a36daf484e2a2012274950e084815b936b1319aeebcf7809574f6"},
+  "ex_doc": {:hex, :ex_doc, "0.29.2", "dfa97532ba66910b2a3016a4bbd796f41a86fc71dd5227e96f4c8581fdf0fdf0", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "6b5d7139eda18a753e3250e27e4a929f8d2c880dd0d460cb9986305dea3e03af"},
+  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
-  "nerves": {:hex, :nerves, "1.9.3", "da7f756bffcd5ad5ebc5e4a77197f685bba5f593609a08c4ab7c31d3715f4c9b", [:make, :mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "28a95aa32e64fe0296fde5207555fc35a7b96b71a49458c2822a7319c5deae8b"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.22.3", "69e54f9d1b36ec0c21efbb19d9b955abe931f905a1620538afced1b3b11a964e", [:mix], [], "hexpm", "1277fc962188d6ffb5da6dea186d75145301d0682f65934873f23007113203df"},
+  "nerves": {:hex, :nerves, "1.10.1", "e8dfd49efaa55d3be6facdc6c9eaad1f4f75d8e9f702a06ac4b0c276a0771747", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "85a6cc88b19c4652ed5c4b720639824885e9646291e4cb8bae504af1685ae28c"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.22.4", "d0004d780a6c75f2577405e5968a9619bd31211550f0a524b179ccab58aaf64f", [:mix], [], "hexpm", "d80f298575c8d1ba6a79a08745d89095729ed8ab7d08ec0abf674863499b9151"},
   "nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
   "nerves_toolchain_aarch64_nerves_linux_gnu": {:hex, :nerves_toolchain_aarch64_nerves_linux_gnu, "1.8.0", "40f7fe58737aaa9c6beee0e3599cca2265d1b4e40d7ab2713d7ad872349f21c2", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.9.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "c06a16b54634bbab7348ee7686e3b02574e0af742144c406b0f196b5b374349c"},
   "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.9.3", "60e87fde05988c4264babc8d68a9221c7b8fe5dc195b7d1526f29b8e626c735c", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2b6edb0687b7f78d3fa49958d759f647e351b23c1f59f637c617a6dc179994ae"},
diff --git a/test/mix.lock b/test/mix.lock
index 720ffe7..40f648d 100644
--- a/test/mix.lock
+++ b/test/mix.lock
@@ -15,7 +15,7 @@
   "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "muontrap": {:hex, :muontrap, "1.2.0", "d6f458978d3ecfc8801a48ef3720f0d51bc1782dec44c40ad4d8ef522320905d", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "7702c219a5ae0e9daad1e00eb7d45b9796d362d97abbbd73a31fb172411dc284"},
-  "nerves": {:hex, :nerves, "1.9.3", "da7f756bffcd5ad5ebc5e4a77197f685bba5f593609a08c4ab7c31d3715f4c9b", [:make, :mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "28a95aa32e64fe0296fde5207555fc35a7b96b71a49458c2822a7319c5deae8b"},
+  "nerves": {:hex, :nerves, "1.10.1", "e8dfd49efaa55d3be6facdc6c9eaad1f4f75d8e9f702a06ac4b0c276a0771747", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "85a6cc88b19c4652ed5c4b720639824885e9646291e4cb8bae504af1685ae28c"},
   "nerves_hub": {:hex, :nerves_hub, "0.7.4", "0e104cad468c3d601ed423e116ea3422fbd31b7eedb263bcb2a5c489dca8b53b", [:mix], [{:fwup, "~> 0.3.0", [hex: :fwup, repo: "hexpm", optional: false]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:nerves_hub_cli, "~> 0.9", [hex: :nerves_hub_cli, repo: "hexpm", optional: false]}, {:nerves_runtime, "~> 0.8", [hex: :nerves_runtime, repo: "hexpm", optional: false]}, {:phoenix_client, "~> 0.7", [hex: :phoenix_client, repo: "hexpm", optional: false]}, {:websocket_client, "~> 1.3", [hex: :websocket_client, repo: "hexpm", optional: false]}, {:x509, "~> 0.5", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "af1daf7e879f1175c9db1957340b1773f11a00e1c63eb591427d1bf7f3d40b47"},
   "nerves_hub_ca_store": {:hex, :nerves_hub_ca_store, "1.0.0", "d8681e8f08d2d1b8a43184a5e8370066f62b949a4bcf19cde880a0dbe45bb1f4", [:mix], [{:x509, "~> 0.5", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "01fbf3edc64be5bf8f3fc65f7f8ca6b82dab650af4373e201b6d441ded476c84"},
   "nerves_hub_cli": {:hex, :nerves_hub_cli, "0.12.0", "ea5b9ef0371b13494210dffc0dfdb6e6da181f9638350f6e6b7e6f7425657f06", [:mix], [{:nerves_hub_user_api, "~> 0.9.0", [hex: :nerves_hub_user_api, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 0.7 or ~> 1.1", [hex: :nimble_csv, repo: "hexpm", optional: false]}, {:pbcs, "0.1.2 or ~> 0.1.4", [hex: :pbcs, repo: "hexpm", optional: false]}, {:table_rex, "~> 2.0.0 or ~> 3.0", [hex: :table_rex, repo: "hexpm", optional: false]}, {:x509, "~> 0.3", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "98e1890437613e170df34b257ebf1ddb8f7efc502c4a0c2ce377bf3184fd2be7"},
@@ -24,7 +24,7 @@
   "nerves_key_pkcs11": {:hex, :nerves_key_pkcs11, "0.2.4", "0a71caa3df944ddb8243ebf324a6ab598c3c8000bb66eea02faf37e71d91bb88", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "1dc166d91f7d189264db1b75f8ddcb2f942867e8c95b75a5de9fb4a80a828a24"},
   "nerves_logging": {:hex, :nerves_logging, "0.2.0", "4099b860f41a0171ff49fbc1e86ee0ce4576c24c1cf318a0fd0bf227355e8c12", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "07cfb9fe9d21b908da51b81a1ced858288c68519204aca7aa2c1fcd531d5e059"},
   "nerves_runtime": {:hex, :nerves_runtime, "0.13.3", "378d6dda56291c0144567f24eb2d4ade314012443ce5d03542adec93091ad9b7", [:mix], [{:nerves_logging, "~> 0.2.0", [hex: :nerves_logging, repo: "hexpm", optional: false]}, {:nerves_uevent, "~> 0.1.0", [hex: :nerves_uevent, repo: "hexpm", optional: false]}, {:uboot_env, "~> 0.3.0 or ~> 1.0", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm", "00b51d9675cae78cc82910e18508e5c8b8a032dad7a83d417c4d061d802e3107"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.22.3", "69e54f9d1b36ec0c21efbb19d9b955abe931f905a1620538afced1b3b11a964e", [:mix], [], "hexpm", "1277fc962188d6ffb5da6dea186d75145301d0682f65934873f23007113203df"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.22.4", "d0004d780a6c75f2577405e5968a9619bd31211550f0a524b179ccab58aaf64f", [:mix], [], "hexpm", "d80f298575c8d1ba6a79a08745d89095729ed8ab7d08ec0abf674863499b9151"},
   "nerves_test_client": {:git, "https://github.com/mobileoverlord/nerves_test_client.git", "2ce416b60db08313da9ec7b7d03e0becc2f7e5ec", []},
   "nerves_toolchain_aarch64_nerves_linux_gnu": {:hex, :nerves_toolchain_aarch64_nerves_linux_gnu, "1.8.0", "40f7fe58737aaa9c6beee0e3599cca2265d1b4e40d7ab2713d7ad872349f21c2", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.9.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "c06a16b54634bbab7348ee7686e3b02574e0af742144c406b0f196b5b374349c"},
   "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.9.3", "60e87fde05988c4264babc8d68a9221c7b8fe5dc195b7d1526f29b8e626c735c", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2b6edb0687b7f78d3fa49958d759f647e351b23c1f59f637c617a6dc179994ae"},

From ca06ad226b930d91868c5ca9812ac0cc518a9156 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Fri, 10 Mar 2023 08:05:50 -0500
Subject: [PATCH 2/9] Remove unused tests

---
 .circleci/config.yml                  |  6 ---
 test/.gitignore                       | 17 -------
 test/README.md                        | 65 ---------------------------
 test/config/config.exs                | 53 ----------------------
 test/lib/test.ex                      |  2 -
 test/lib/test/application.ex          | 19 --------
 test/mix.exs                          | 55 -----------------------
 test/mix.lock                         | 47 -------------------
 test/rel/test/nerves_runtime_test.exs | 37 ---------------
 test/rel/test/test_helper.exs         |  1 -
 test/rel/test/test_test.exs           |  7 ---
 test/rel/vm.args.eex                  | 43 ------------------
 12 files changed, 352 deletions(-)
 delete mode 100644 test/.gitignore
 delete mode 100644 test/README.md
 delete mode 100644 test/config/config.exs
 delete mode 100644 test/lib/test.ex
 delete mode 100644 test/lib/test/application.ex
 delete mode 100644 test/mix.exs
 delete mode 100644 test/mix.lock
 delete mode 100644 test/rel/test/nerves_runtime_test.exs
 delete mode 100644 test/rel/test/test_helper.exs
 delete mode 100644 test/rel/test/test_test.exs
 delete mode 100644 test/rel/vm.args.eex

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6fc5ecb..8130b23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,12 +29,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - build-tools/build-test:
-          exec:
-            <<: *exec
-          context: org-global
-          requires:
-            - build-tools/build-system
       - build-tools/deploy-system:
           exec:
             <<: *exec
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index 25a2065..0000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# The directory Mix will write compiled artifacts to.
-/_build/
-
-# If you run "mix test --cover", coverage assets end up here.
-/cover/
-
-# The directory Mix downloads your dependencies sources to.
-/deps/
-
-# Where 3rd-party dependencies like ExDoc output generated docs.
-/doc/
-
-# Ignore .fetch files in case you like to edit your project deps locally.
-/.fetch
-
-# If the VM crashes, it generates a dump, let's ignore it too.
-erl_crash.dump
diff --git a/test/README.md b/test/README.md
deleted file mode 100644
index 50ef0ae..0000000
--- a/test/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Raspberry Pi 4 Test Suite
-
-Executes ExUnit tests on target hardware and reports results to the
-[Nerves test server](https://nerves-test-server.herokuapp.com/nerves-project/nerves_system_rpi4)
-
-For more information on how to configure your own test farm please refer to the
-[Nerves test server source](https://github.com/mobileoverlord/nerves_test_server)
-
-## Setup
-
-### Signing firmware
-
-Firmware for the test farm is signed so it can be validated before being applied
-to the device. In order to sign trusted firmware, you will require the env variable
-`NERVES_FW_PRIV_KEY` and `NERVES_FW_PUB_KEY` to be set. Use `fwup` to configure
-your own test server keys
-
-```
-$ fwup -g
-```
-
-The get the base64 values and export the variables
-```
-$ export NERVES_FW_PRIV_KEY=$(cat fwup-key.priv | base64)
-$ export NERVES_FW_PUB_KEY=$(cat fwup-key.pub | base64)
-```
-
-### Configure the environment
-
-```
-$ export MIX_ENV=test
-$ export NERVES_TEST_SERVER=nerves-test-server.herokuapp.com
-$ export WEBSOCKET_PROTOCOL=wss
-```
-
-### Building
-
-Fetch the dependencies
-
-```
-$ mix deps.get
-```
-
-Create the firmware
-
-```
-$ mix firmware
-```
-
-Sign the firmware
-
-```
-$ fwup --sign --private-key $NERVES_FW_PRIV_KEY -i _build/test/nerves/images/test.fw -o _build/test/nerves/images/test.fw
-```
-
-Burn it to an SD card
-
-```
-$ mix firmware.burn
-```
-
-## Provisioning
-
-The Raspberry Pi 4 uses `eth0` to connect to the report server and requires a
-wired ethernet connection. The device should establish a connection to the network and join the test farm.
diff --git a/test/config/config.exs b/test/config/config.exs
deleted file mode 100644
index 4f16d1b..0000000
--- a/test/config/config.exs
+++ /dev/null
@@ -1,53 +0,0 @@
-use Mix.Config
-
-# Repository specific configuration
-
-platform = "rpi4"
-arch = "arm"
-
-app_part_devparth = "/dev/mmcblk0p3"
-
-# Environment specific configuration
-#  Nerves Project test farm configuration
-#  NERVES_TEST_SERVER = nerves-test-server.herokuapp.com
-#  WEBSOCKET_PROTOCOL = wss
-
-test_server = System.get_env("NERVES_TEST_SERVER")
-websocket_protocol = System.get_env("WEBSOCKET_PROTOCOL") || "ws"
-
-# Common configuration
-
-# Configure shoehorn boot order.
-config :shoehorn,
-  app: :nerves_system_test,
-  init: [:nerves_runtime, :vintage_net]
-
-config :nerves_hub,
-  public_keys: [
-    System.get_env("NERVES_HUB_FW_PUBLIC_KEY")
-  ]
-
-config :vintage_net,
-  regulatory_domain: "US",
-  config: [
-    {"eth0", %{type: VintageNet.Technology.Ethernet, ipv4: %{method: :dhcp}}},
-    {"wlan0", %{type: VintageNet.Technology.WiFi}}
-  ]
-
-# Configure the url for the connection to the test server phoenix channel socket.
-config :nerves_test_client, :socket,
-  url: "#{websocket_protocol}://#{test_server}/socket/websocket"
-
-# The configuration stored here is duplicated from the project so it can be
-#  validated by nerves_test_client because the source is unavailable at runtime.
-config :nerves_runtime, :kv,
-  nerves_fw_application_part0_devpath: app_part_devparth,
-  nerves_fw_application_part0_fstype: "f2fs",
-  nerves_fw_application_part0_target: "/root",
-  nerves_fw_architecture: arch,
-  nerves_fw_author: "The Nerves Team",
-  nerves_fw_description: Mix.Project.config()[:description],
-  nerves_fw_platform: platform,
-  nerves_fw_product: Mix.Project.config()[:app],
-  nerves_fw_vcs_identifier: System.get_env("NERVES_FW_VCS_IDENTIFIER"),
-  nerves_fw_version: Mix.Project.config()[:version]
diff --git a/test/lib/test.ex b/test/lib/test.ex
deleted file mode 100644
index 88945e0..0000000
--- a/test/lib/test.ex
+++ /dev/null
@@ -1,2 +0,0 @@
-defmodule Test do
-end
diff --git a/test/lib/test/application.ex b/test/lib/test/application.ex
deleted file mode 100644
index df76473..0000000
--- a/test/lib/test/application.ex
+++ /dev/null
@@ -1,19 +0,0 @@
-defmodule Test.Application do
-  use Application
-
-  # See http://elixir-lang.org/docs/stable/elixir/Application.html
-  # for more information on OTP Applications
-  def start(_type, _args) do
-    import Supervisor.Spec, warn: false
-
-    # Define workers and child supervisors to be supervised
-    children = [
-      # worker(Test.Worker, [arg1, arg2, arg3]),
-    ]
-
-    # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
-    # for other strategies and supported options
-    opts = [strategy: :one_for_one, name: Test.Supervisor]
-    Supervisor.start_link(children, opts)
-  end
-end
diff --git a/test/mix.exs b/test/mix.exs
deleted file mode 100644
index 41e6a1f..0000000
--- a/test/mix.exs
+++ /dev/null
@@ -1,55 +0,0 @@
-if Mix.env() == :test do
-  hash =
-    :os.cmd('git rev-parse HEAD')
-    |> to_string
-    |> String.trim()
-
-  System.put_env("NERVES_FW_VCS_IDENTIFIER", hash)
-end
-
-defmodule Test.MixProject do
-  use Mix.Project
-
-  @app :test
-
-  def project do
-    [
-      app: @app,
-      name: "system-test",
-      version: "0.1.0",
-      elixir: "~> 1.9",
-      archives: [nerves_bootstrap: "~> 1.6"],
-      start_permanent: Mix.env() == :prod,
-      aliases: [loadconfig: [&bootstrap/1]],
-      deps: deps(),
-      releases: [{@app, release()}]
-    ]
-  end
-
-  # Type `mix help compile.app` to learn about applications.
-  def application, do: []
-
-  defp bootstrap(args) do
-    Mix.target(:target)
-    Application.start(:nerves_bootstrap)
-    Mix.Task.run("loadconfig", args)
-  end
-
-  # Run "mix help deps" to learn about dependencies.
-  defp deps do
-    [
-      {:nerves_system_rpi4, path: "../", runtime: false},
-      {:shoehorn, "~> 0.6"},
-      {:nerves_test_client, github: "mobileoverlord/nerves_test_client"}
-    ]
-  end
-
-  def release do
-    [
-      overwrite: true,
-      cookie: "#{@app}_cookie",
-      include_erts: &Nerves.Release.erts/0,
-      steps: [&Nerves.Release.init/1, :assemble]
-    ]
-  end
-end
diff --git a/test/mix.lock b/test/mix.lock
deleted file mode 100644
index 40f648d..0000000
--- a/test/mix.lock
+++ /dev/null
@@ -1,47 +0,0 @@
-%{
-  "atecc508a": {:hex, :atecc508a, "0.3.0", "794e2470302d101005b2b9f85d13d0a188675a84f13e668e446cd318b7679f6f", [:mix], [{:circuits_i2c, "~> 0.2", [hex: :circuits_i2c, repo: "hexpm", optional: false]}, {:x509, "~> 0.5.1 or ~> 0.6", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "e7041edeab56d0fd8773f46b5dec3398d1f28b75683dfa738d316f84495284be"},
-  "beam_notify": {:hex, :beam_notify, "1.0.0", "5b8dceed76f8ac4acadf4d2915ac85b98c42bb17d7dd58253c7593d2a0deedbd", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "a80331f6c3596918affa408d91ed634106b7ae71b3fc589432363aca68378362"},
-  "castore": {:hex, :castore, "0.1.22", "4127549e411bedd012ca3a308dede574f43819fe9394254ca55ab4895abfa1a2", [:mix], [], "hexpm", "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac"},
-  "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
-  "circuits_i2c": {:hex, :circuits_i2c, "0.3.9", "746a599ac06f8d31572143a8c51e1bc787246c173669940dc23e078907fb13e1", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "c6d75387637a4fbae77cf37af45000fe23763eb8104cc50e7aae532bec46e91d"},
-  "elixir_make": {:hex, :elixir_make, "0.7.5", "784cc00f5fa24239067cc04d449437dcc5f59353c44eb08f188b2b146568738a", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "c3d63e8d5c92fa3880d89ecd41de59473fa2e83eeb68148155e25e8b95aa2887"},
-  "ex_unit_release": {:hex, :ex_unit_release, "0.1.0", "c7d180f82965dc1fd6a5f72359c813407bf4902af251914884781f5847cfdedb", [:mix], [], "hexpm", "212a88aff126196b61bef7d6b32b1c9495a00ddab727c72b7d7f5025034b4454"},
-  "fwup": {:hex, :fwup, "0.3.0", "2c360815565fcbc945ebbb34b58f156efacb7f8d64766f1cb3426919bb3f41ea", [:mix], [], "hexpm", "d12990ebda7d485d0eb7502df7aa9a56e66f67b5eda158c352db1de48e3f0518"},
-  "gen_state_machine": {:hex, :gen_state_machine, "3.0.0", "1e57f86a494e5c6b14137ebef26a7eb342b3b0070c7135f2d6768ed3f6b6cdff", [:mix], [], "hexpm", "0a59652574bebceb7309f6b749d2a41b45fdeda8dbb4da0791e355dd19f0ed15"},
-  "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~> 2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
-  "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
-  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
-  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
-  "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
-  "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
-  "muontrap": {:hex, :muontrap, "1.2.0", "d6f458978d3ecfc8801a48ef3720f0d51bc1782dec44c40ad4d8ef522320905d", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "7702c219a5ae0e9daad1e00eb7d45b9796d362d97abbbd73a31fb172411dc284"},
-  "nerves": {:hex, :nerves, "1.10.1", "e8dfd49efaa55d3be6facdc6c9eaad1f4f75d8e9f702a06ac4b0c276a0771747", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "85a6cc88b19c4652ed5c4b720639824885e9646291e4cb8bae504af1685ae28c"},
-  "nerves_hub": {:hex, :nerves_hub, "0.7.4", "0e104cad468c3d601ed423e116ea3422fbd31b7eedb263bcb2a5c489dca8b53b", [:mix], [{:fwup, "~> 0.3.0", [hex: :fwup, repo: "hexpm", optional: false]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:nerves_hub_cli, "~> 0.9", [hex: :nerves_hub_cli, repo: "hexpm", optional: false]}, {:nerves_runtime, "~> 0.8", [hex: :nerves_runtime, repo: "hexpm", optional: false]}, {:phoenix_client, "~> 0.7", [hex: :phoenix_client, repo: "hexpm", optional: false]}, {:websocket_client, "~> 1.3", [hex: :websocket_client, repo: "hexpm", optional: false]}, {:x509, "~> 0.5", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "af1daf7e879f1175c9db1957340b1773f11a00e1c63eb591427d1bf7f3d40b47"},
-  "nerves_hub_ca_store": {:hex, :nerves_hub_ca_store, "1.0.0", "d8681e8f08d2d1b8a43184a5e8370066f62b949a4bcf19cde880a0dbe45bb1f4", [:mix], [{:x509, "~> 0.5", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "01fbf3edc64be5bf8f3fc65f7f8ca6b82dab650af4373e201b6d441ded476c84"},
-  "nerves_hub_cli": {:hex, :nerves_hub_cli, "0.12.0", "ea5b9ef0371b13494210dffc0dfdb6e6da181f9638350f6e6b7e6f7425657f06", [:mix], [{:nerves_hub_user_api, "~> 0.9.0", [hex: :nerves_hub_user_api, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 0.7 or ~> 1.1", [hex: :nimble_csv, repo: "hexpm", optional: false]}, {:pbcs, "0.1.2 or ~> 0.1.4", [hex: :pbcs, repo: "hexpm", optional: false]}, {:table_rex, "~> 2.0.0 or ~> 3.0", [hex: :table_rex, repo: "hexpm", optional: false]}, {:x509, "~> 0.3", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "98e1890437613e170df34b257ebf1ddb8f7efc502c4a0c2ce377bf3184fd2be7"},
-  "nerves_hub_user_api": {:hex, :nerves_hub_user_api, "0.9.1", "5be21cdbab2a42060719f7da9d095c1353f6ada5d6c3a67ce8e0dc639db0d87a", [:mix], [{:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:nerves_hub_ca_store, "~> 1.0.0", [hex: :nerves_hub_ca_store, repo: "hexpm", optional: false]}, {:tesla, "~> 1.2.1 or ~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}, {:x509, "~> 0.3", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "6ad2c59ccfc3d1de9179b8c2618a356dc5eeecf01f610dbc4eb7a009fe2f3fa4"},
-  "nerves_key": {:hex, :nerves_key, "0.5.5", "68fcf3de7e4a64eebbd22a92f97209732d78185471e6eb89d4013e5495b7df44", [:mix], [{:atecc508a, "~> 0.3.0", [hex: :atecc508a, repo: "hexpm", optional: false]}, {:nerves_key_pkcs11, "~> 0.2", [hex: :nerves_key_pkcs11, repo: "hexpm", optional: false]}], "hexpm", "0ab871d3bf612c77a066452f88542b3d2f5cf5587f829f12f58cfa8b87d997de"},
-  "nerves_key_pkcs11": {:hex, :nerves_key_pkcs11, "0.2.4", "0a71caa3df944ddb8243ebf324a6ab598c3c8000bb66eea02faf37e71d91bb88", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "1dc166d91f7d189264db1b75f8ddcb2f942867e8c95b75a5de9fb4a80a828a24"},
-  "nerves_logging": {:hex, :nerves_logging, "0.2.0", "4099b860f41a0171ff49fbc1e86ee0ce4576c24c1cf318a0fd0bf227355e8c12", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "07cfb9fe9d21b908da51b81a1ced858288c68519204aca7aa2c1fcd531d5e059"},
-  "nerves_runtime": {:hex, :nerves_runtime, "0.13.3", "378d6dda56291c0144567f24eb2d4ade314012443ce5d03542adec93091ad9b7", [:mix], [{:nerves_logging, "~> 0.2.0", [hex: :nerves_logging, repo: "hexpm", optional: false]}, {:nerves_uevent, "~> 0.1.0", [hex: :nerves_uevent, repo: "hexpm", optional: false]}, {:uboot_env, "~> 0.3.0 or ~> 1.0", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm", "00b51d9675cae78cc82910e18508e5c8b8a032dad7a83d417c4d061d802e3107"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.22.4", "d0004d780a6c75f2577405e5968a9619bd31211550f0a524b179ccab58aaf64f", [:mix], [], "hexpm", "d80f298575c8d1ba6a79a08745d89095729ed8ab7d08ec0abf674863499b9151"},
-  "nerves_test_client": {:git, "https://github.com/mobileoverlord/nerves_test_client.git", "2ce416b60db08313da9ec7b7d03e0becc2f7e5ec", []},
-  "nerves_toolchain_aarch64_nerves_linux_gnu": {:hex, :nerves_toolchain_aarch64_nerves_linux_gnu, "1.8.0", "40f7fe58737aaa9c6beee0e3599cca2265d1b4e40d7ab2713d7ad872349f21c2", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.9.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "c06a16b54634bbab7348ee7686e3b02574e0af742144c406b0f196b5b374349c"},
-  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.9.3", "60e87fde05988c4264babc8d68a9221c7b8fe5dc195b7d1526f29b8e626c735c", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2b6edb0687b7f78d3fa49958d759f647e351b23c1f59f637c617a6dc179994ae"},
-  "nerves_uevent": {:hex, :nerves_uevent, "0.1.0", "651111a46be9a238560cbf7946989fc500e5f33d7035fd9ea7194d07a281bc19", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:property_table, "~> 0.2.0", [hex: :property_table, repo: "hexpm", optional: false]}], "hexpm", "cb0b1993c3ed3cefadbcdb534e910af0661f95c3445796ce8a7c8be3519a4e5f"},
-  "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
-  "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
-  "pbcs": {:hex, :pbcs, "0.1.4", "84c64d6ec826a57821021c03b0db3598ee587ba64430badee77809c2f68a9f8c", [:mix], [], "hexpm", "1f96954e50077e9cfde3cce62da452f4e56906d019ef141c011a96f79137dec0"},
-  "phoenix_client": {:hex, :phoenix_client, "0.11.1", "b64de69050a3a435438a2545d6f3afcd5fa105b74110bb5212364e2f3ce96a46", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:websocket_client, "~> 1.3", [hex: :websocket_client, repo: "hexpm", optional: false]}], "hexpm", "07edd8a87725b0158abe35711aeaf857e8f8c3c17727725b9324533d5abdf880"},
-  "property_table": {:hex, :property_table, "0.2.2", "79c6879e74f510d8a5990d574e9da85fb8a8e7e14c5ad6367fdc8f757ec58ba2", [:mix], [], "hexpm", "984870a52d531413dc36c194e0b438a1d70781a222fae588bb965d460cb112ff"},
-  "shoehorn": {:hex, :shoehorn, "0.9.1", "8e12670024c2942e3c2fdd27cd5a034ee0337ee7c25c37b3ebc2ad482de67199", [:mix], [], "hexpm", "fccd040ac22de9b3cc111bbf78a363832c7210010a3fff4a550fbb2f10de0692"},
-  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
-  "system_registry": {:hex, :system_registry, "0.8.2", "df791dc276652fcfb53be4dab823e05f8269b96ac57c26f86a67838dbc0eefe7", [:mix], [], "hexpm", "f7acdede22c73ab0b3735eead7f2095efb2a7a6198366564205274db2ca2a8f8"},
-  "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
-  "tesla": {:hex, :tesla, "1.5.1", "f2ba04f5e6ace0f1954f1fb4375f55809a5f2ff491c18ccb09fbc98370d4280b", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "2815d4f6550973d1ed65692d545d079174f6a1f8cb4775f6eb606cbc0666a9de"},
-  "uboot_env": {:hex, :uboot_env, "1.0.1", "b0e136cf1a561412ff7db23ed2b6df18d7c7ce2fc59941afd851006788a67f3d", [:mix], [], "hexpm", "b6d4fe7c24123be57ed946c48116d23173e37944bc945b8b76fccc437909c60b"},
-  "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
-  "vintage_net": {:hex, :vintage_net, "0.13.0", "97db437d3d10988acfb677e6ff12d6a5862cf23295c6046a3624f7e4a1653725", [:make, :mix], [{:beam_notify, "~> 0.2.0 or ~> 1.0", [hex: :beam_notify, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:gen_state_machine, "~> 2.0.0 or ~> 2.1.0 or ~> 3.0.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:muontrap, "~> 0.5.1 or ~> 0.6.0 or ~> 1.0", [hex: :muontrap, repo: "hexpm", optional: false]}, {:property_table, "~> 0.2.0", [hex: :property_table, repo: "hexpm", optional: false]}], "hexpm", "5b48a55fa9b5fca6ea06295a94a91c7fe2f2e47fb532f043d2981ce1604d5080"},
-  "websocket_client": {:hex, :websocket_client, "1.5.0", "e825f23c51a867681a222148ed5200cc4a12e4fb5ff0b0b35963e916e2b5766b", [:rebar3], [], "hexpm", "2b9b201cc5c82b9d4e6966ad8e605832eab8f4ddb39f57ac62f34cb208b68de9"},
-  "x509": {:hex, :x509, "0.8.5", "22b2c5dfc87b05d46595d3764f41a23fcb7360f891e0464f1a2ec118177cd4e4", [:mix], [], "hexpm", "c63eb89e8bbe8a5e21b6404ad1082faff670e38b74960297f90d023177949e07"},
-}
diff --git a/test/rel/test/nerves_runtime_test.exs b/test/rel/test/nerves_runtime_test.exs
deleted file mode 100644
index 528a748..0000000
--- a/test/rel/test/nerves_runtime_test.exs
+++ /dev/null
@@ -1,37 +0,0 @@
-defmodule NervesRuntime.Test do
-  use ExUnit.Case
-
-  describe "application data partition" do
-    test "can be written to" do
-      file = "/root/tmp"
-      content = "hello"
-      assert :ok == File.write(file, content)
-      assert {:ok, content} == File.read(file)
-    end
-  end
-
-  describe "key value store" do
-    test "can be read from" do
-      tests = Application.get_env(:nerves_runtime, :kv)
-
-      assert Enum.all?(tests, fn {k, v} ->
-               v =
-                 to_string(v)
-                 |> String.trim()
-
-               kv =
-                 to_string(k)
-                 |> Nerves.Runtime.KV.get_active()
-                 |> String.trim()
-
-               v == kv
-             end)
-    end
-  end
-
-  test "hostname has the form nerves-id" do
-    {:ok, hostname} = :inet.gethostname()
-    hostname = to_string(hostname)
-    assert String.match?(hostname, ~r/nerves-[0-9]+/)
-  end
-end
diff --git a/test/rel/test/test_helper.exs b/test/rel/test/test_helper.exs
deleted file mode 100644
index 869559e..0000000
--- a/test/rel/test/test_helper.exs
+++ /dev/null
@@ -1 +0,0 @@
-ExUnit.start()
diff --git a/test/rel/test/test_test.exs b/test/rel/test/test_test.exs
deleted file mode 100644
index 403ba38..0000000
--- a/test/rel/test/test_test.exs
+++ /dev/null
@@ -1,7 +0,0 @@
-defmodule TestTest do
-  use ExUnit.Case
-
-  test "i2c-1 interface exists" do
-    assert File.exists?("/dev/i2c-1")
-  end
-end
diff --git a/test/rel/vm.args.eex b/test/rel/vm.args.eex
deleted file mode 100644
index 6eec484..0000000
--- a/test/rel/vm.args.eex
+++ /dev/null
@@ -1,43 +0,0 @@
-## Add custom options here
-
-## Distributed Erlang Options
-##  The cookie needs to be configured prior to vm boot for
-##  for read only filesystem.
-
--setcookie <%= @release.options[:cookie] %>
-
-## Use Ctrl-C to interrupt the current shell rather than invoking the emulator's
-## break handler and possibly exiting the VM.
-+Bc
-
-# Allow time warps so that the Erlang system time can more closely match the
-# OS system time.
-+C multi_time_warp
-
-## Load code at system startup
-## See http://erlang.org/doc/system_principles/system_principles.html#code-loading-strategy
--mode embedded
-
-## Save the shell history between reboots
-## See http://erlang.org/doc/man/kernel_app.html for additional options
--kernel shell_history enabled
-
-## Enable heartbeat monitoring of the Erlang runtime system
--heart -env HEART_BEAT_TIMEOUT 30
-
-## Start the Elixir shell
-
--noshell
--user Elixir.IEx.CLI
-
-## Enable colors in the shell
--elixir ansi_enabled true
-
-## Options added after -extra are interpreted as plain arguments and can be
-## retrieved using :init.get_plain_arguments(). Options before the "--" are
-## interpreted by Elixir and anything afterwards is left around for other IEx
-## and user applications.
--extra --no-halt
-#--
-#--dot-iex /etc/iex.exs
-

From af084ac7065d7dd8fd790f93424e373f88906c14 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Mon, 3 Apr 2023 19:52:04 -0400
Subject: [PATCH 3/9] nerves_system_br: bump to v1.22.5

---
 .circleci/config.yml |  6 +++---
 mix.exs              |  2 +-
 mix.lock             | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8130b23..1e65100 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,12 +1,12 @@
 exec: &exec
   name: build-tools/nerves-system-br
-  version: 1.22.4
-  elixir: 1.14.3-otp-25
+  version: 1.22.5
+  elixir: 1.14.4-otp-25
 
 version: 2.1
 
 orbs:
-  build-tools: nerves-project/build-tools@0.2.2
+  build-tools: nerves-project/build-tools@0.2.3
 
 workflows:
   version: 2
diff --git a/mix.exs b/mix.exs
index 768f45a..1596dd2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -67,7 +67,7 @@ defmodule NervesSystemRpi4.MixProject do
   defp deps do
     [
       {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.15 or ~> 1.8", runtime: false},
-      {:nerves_system_br, "1.22.4", runtime: false},
+      {:nerves_system_br, "1.22.5", runtime: false},
       {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.8.0", runtime: false},
       {:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
       {:ex_doc, "~> 0.22", only: :docs, runtime: false}
diff --git a/mix.lock b/mix.lock
index 82c6880..f6c9f01 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,16 +1,16 @@
 %{
-  "castore": {:hex, :castore, "0.1.22", "4127549e411bedd012ca3a308dede574f43819fe9394254ca55ab4895abfa1a2", [:mix], [], "hexpm", "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac"},
+  "castore": {:hex, :castore, "1.0.1", "240b9edb4e9e94f8f56ab39d8d2d0a57f49e46c56aced8f873892df8ff64ff5a", [:mix], [], "hexpm", "b4951de93c224d44fac71614beabd88b71932d0b1dea80d2f80fb9044e01bbb3"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.31", "a93921cdc6b9b869f519213d5bc79d9e218ba768d7270d46fdcf1c01bacff9e2", [:mix], [], "hexpm", "317d367ee0335ef037a87e46c91a2269fef6306413f731e8ec11fc45a7efd059"},
-  "elixir_make": {:hex, :elixir_make, "0.7.5", "784cc00f5fa24239067cc04d449437dcc5f59353c44eb08f188b2b146568738a", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "c3d63e8d5c92fa3880d89ecd41de59473fa2e83eeb68148155e25e8b95aa2887"},
-  "ex_doc": {:hex, :ex_doc, "0.29.2", "dfa97532ba66910b2a3016a4bbd796f41a86fc71dd5227e96f4c8581fdf0fdf0", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "6b5d7139eda18a753e3250e27e4a929f8d2c880dd0d460cb9986305dea3e03af"},
+  "elixir_make": {:hex, :elixir_make, "0.7.6", "67716309dc5d43e16b5abbd00c01b8df6a0c2ab54a8f595468035a50189f9169", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5a0569756b0f7873a77687800c164cca6dfc03a09418e6fcf853d78991f49940"},
+  "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
   "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
-  "makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
   "nerves": {:hex, :nerves, "1.10.1", "e8dfd49efaa55d3be6facdc6c9eaad1f4f75d8e9f702a06ac4b0c276a0771747", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "85a6cc88b19c4652ed5c4b720639824885e9646291e4cb8bae504af1685ae28c"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.22.4", "d0004d780a6c75f2577405e5968a9619bd31211550f0a524b179ccab58aaf64f", [:mix], [], "hexpm", "d80f298575c8d1ba6a79a08745d89095729ed8ab7d08ec0abf674863499b9151"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.22.5", "56c514ed0f3e7ab00d070ad1946e58ccbad134711b8688c350ef9b3ce599e45d", [:mix], [], "hexpm", "ae5c0df668de14c4bfa0a965b0328ed2f96050e9ac14d94461e6dc97ac76eee2"},
   "nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
   "nerves_toolchain_aarch64_nerves_linux_gnu": {:hex, :nerves_toolchain_aarch64_nerves_linux_gnu, "1.8.0", "40f7fe58737aaa9c6beee0e3599cca2265d1b4e40d7ab2713d7ad872349f21c2", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.9.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "c06a16b54634bbab7348ee7686e3b02574e0af742144c406b0f196b5b374349c"},
   "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.9.3", "60e87fde05988c4264babc8d68a9221c7b8fe5dc195b7d1526f29b8e626c735c", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2b6edb0687b7f78d3fa49958d759f647e351b23c1f59f637c617a6dc179994ae"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.3.0", "9e18a119d9efc3370a3ef2a937bf0b24c088d9c4bf0ba9d7c3751d49d347d035", [:mix], [], "hexpm", "7977f183127a7cbe9346981e2f480dc04c55ffddaef746bd58debd566070eef8"},
 }

From 8ba745aba6eb83a6d3671e6c614e4183ae07495d Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Mon, 3 Apr 2023 22:23:07 -0400
Subject: [PATCH 4/9] v1.22.2 release

---
 CHANGELOG.md | 9 +++++++++
 VERSION      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25e7594..8372aee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,15 @@ follows:
    releases, and Linux kernel updates. They're also made to fix bugs and add
    features to the build infrastructure.
 
+## v1.22.2
+
+This is a bug and security fix update. It should be a low risk upgrade from
+v1.22.1.
+
+* Updated dependencies
+  * [nerves_system_br v1.22.5](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.22.5)
+  * [Buildroot 2022.11.3](https://lore.kernel.org/buildroot/878rfuxbxx.fsf@dell.be.48ers.dk/T/)
+
 ## v1.22.1
 
 This is a bug fix and Erlang version bump from 25.2 to 25.2.3. It should be a
diff --git a/VERSION b/VERSION
index 6245bee..6fee2fe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.22.1
+1.22.2

From 47ce203fb9fb649579b757ff6d58e410792ba072 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Mon, 17 Apr 2023 08:47:22 -0400
Subject: [PATCH 5/9] linux: bump to 5.15.84 (1.20230106)

This bumps Linux to the latest official tag published by the Raspberry
Pi Foundation in the 5.15 series.
---
 nerves_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nerves_defconfig b/nerves_defconfig
index 1534df0..0dadd58 100644
--- a/nerves_defconfig
+++ b/nerves_defconfig
@@ -28,7 +28,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERN
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20221104.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20230106.tar.gz"
 BR2_LINUX_KERNEL_PATCH="${NERVES_DEFCONFIG_DIR}/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-5.15.defconfig"
@@ -48,7 +48,7 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
 BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20221104"
+BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20230106"
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y
 BR2_PACKAGE_PIGPIO=y
 # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set

From b7a47376e643e6a5e26d2648df7e476239eb6b61 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Fri, 26 May 2023 12:49:28 -0400
Subject: [PATCH 6/9] linux: bump to 6.1.21 (1.20230405)

---
 README.md                                   |   2 +-
 linux-5.15.defconfig => linux-6.1.defconfig | 184 ++++++++++----------
 mix.exs                                     |   2 +-
 nerves_defconfig                            |   6 +-
 4 files changed, 96 insertions(+), 98 deletions(-)
 rename linux-5.15.defconfig => linux-6.1.defconfig (99%)

diff --git a/README.md b/README.md
index e2190ee..0bfb8f5 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ This is the base Nerves System configuration for the Raspberry Pi 4 Model B.
 | CPU                  | 1.5 GHz quad-core Cortex-A72 (64-bit mode) |
 | Memory               | 1 GB, 2 GB, 4 GB DRAM           |
 | Storage              | MicroSD                         |
-| Linux kernel         | 5.10 w/ Raspberry Pi patches    |
+| Linux kernel         | 6.1 w/ Raspberry Pi patches     |
 | IEx terminal         | HDMI and USB keyboard (can be changed to UART) |
 | GPIO, I2C, SPI       | Yes - [Elixir Circuits](https://github.com/elixir-circuits) |
 | ADC                  | No                              |
diff --git a/linux-5.15.defconfig b/linux-6.1.defconfig
similarity index 99%
rename from linux-5.15.defconfig
rename to linux-6.1.defconfig
index 2b77d5c..5cb1894 100644
--- a/linux-5.15.defconfig
+++ b/linux-6.1.defconfig
@@ -23,9 +23,8 @@ CONFIG_NAMESPACES=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_EMBEDDED=y
 # CONFIG_PERF_EVENTS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_PROFILING=y
+CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM2835=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
@@ -34,8 +33,8 @@ CONFIG_NR_CPUS=4
 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=f2fs rootwait"
 # CONFIG_EFI is not set
 # CONFIG_SUSPEND is not set
+CONFIG_PM=y
 CONFIG_CPU_IDLE=y
-CONFIG_ARM_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
@@ -45,7 +44,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-CONFIG_CRYPTO_AES_ARM64_BS=m
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
@@ -57,8 +55,8 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_MQ_IOSCHED_DEADLINE is not set
 # CONFIG_MQ_IOSCHED_KYBER is not set
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
 CONFIG_CMA=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -71,7 +69,6 @@ CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SIT is not set
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
-# CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_NETLINK=m
@@ -155,7 +152,6 @@ CONFIG_TUN=m
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
 CONFIG_BCMGENET=y
-# CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
@@ -174,14 +170,15 @@ CONFIG_BCMGENET=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 # CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_NETERION is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
 # CONFIG_NET_VENDOR_PACKET_ENGINES is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_REALTEK is not set
@@ -189,9 +186,9 @@ CONFIG_BCMGENET=y
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SILAN is not set
 # CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
@@ -283,146 +280,146 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_TC358743=m
 CONFIG_VIDEO_TC358743_CEC=y
 # CONFIG_CXD2880_SPI_DRV is not set
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA18250 is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_E4000 is not set
+# CONFIG_MEDIA_TUNER_FC0011 is not set
+# CONFIG_MEDIA_TUNER_FC0012 is not set
+# CONFIG_MEDIA_TUNER_FC0013 is not set
+# CONFIG_MEDIA_TUNER_FC2580 is not set
+# CONFIG_MEDIA_TUNER_IT913X is not set
+# CONFIG_MEDIA_TUNER_M88RS6000T is not set
+# CONFIG_MEDIA_TUNER_MAX2165 is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
 # CONFIG_MEDIA_TUNER_MSI001 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
 # CONFIG_MEDIA_TUNER_MT2060 is not set
 # CONFIG_MEDIA_TUNER_MT2063 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
 # CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_XC4000 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MXL301RF is not set
 # CONFIG_MEDIA_TUNER_MXL5005S is not set
 # CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-# CONFIG_MEDIA_TUNER_FC0011 is not set
-# CONFIG_MEDIA_TUNER_FC0012 is not set
-# CONFIG_MEDIA_TUNER_FC0013 is not set
+# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
+# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_R820T is not set
+# CONFIG_MEDIA_TUNER_SI2157 is not set
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
 # CONFIG_MEDIA_TUNER_TDA18212 is not set
-# CONFIG_MEDIA_TUNER_E4000 is not set
-# CONFIG_MEDIA_TUNER_FC2580 is not set
-# CONFIG_MEDIA_TUNER_M88RS6000T is not set
+# CONFIG_MEDIA_TUNER_TDA18218 is not set
+# CONFIG_MEDIA_TUNER_TDA18250 is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
 # CONFIG_MEDIA_TUNER_TUA9001 is not set
-# CONFIG_MEDIA_TUNER_SI2157 is not set
-# CONFIG_MEDIA_TUNER_IT913X is not set
-# CONFIG_MEDIA_TUNER_R820T is not set
-# CONFIG_MEDIA_TUNER_MXL301RF is not set
-# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
-# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC4000 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# CONFIG_DVB_MXL5XX is not set
 # CONFIG_DVB_STB0899 is not set
 # CONFIG_DVB_STB6100 is not set
 # CONFIG_DVB_STV090x is not set
 # CONFIG_DVB_STV0910 is not set
 # CONFIG_DVB_STV6110x is not set
 # CONFIG_DVB_STV6111 is not set
-# CONFIG_DVB_MXL5XX is not set
 # CONFIG_DVB_DRXK is not set
-# CONFIG_DVB_TDA18271C2DD is not set
-# CONFIG_DVB_SI2165 is not set
 # CONFIG_DVB_MN88472 is not set
 # CONFIG_DVB_MN88473 is not set
+# CONFIG_DVB_SI2165 is not set
+# CONFIG_DVB_TDA18271C2DD is not set
 # CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24116 is not set
+# CONFIG_DVB_CX24117 is not set
+# CONFIG_DVB_CX24120 is not set
 # CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_DS3000 is not set
+# CONFIG_DVB_MB86A16 is not set
 # CONFIG_DVB_MT312 is not set
-# CONFIG_DVB_ZL10036 is not set
-# CONFIG_DVB_ZL10039 is not set
 # CONFIG_DVB_S5H1420 is not set
-# CONFIG_DVB_STV0288 is not set
+# CONFIG_DVB_SI21XX is not set
 # CONFIG_DVB_STB6000 is not set
+# CONFIG_DVB_STV0288 is not set
 # CONFIG_DVB_STV0299 is not set
-# CONFIG_DVB_STV6110 is not set
 # CONFIG_DVB_STV0900 is not set
-# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_STV6110 is not set
+# CONFIG_DVB_TDA10071 is not set
 # CONFIG_DVB_TDA10086 is not set
+# CONFIG_DVB_TDA8083 is not set
 # CONFIG_DVB_TDA8261 is not set
-# CONFIG_DVB_VES1X93 is not set
-# CONFIG_DVB_TUNER_ITD1000 is not set
-# CONFIG_DVB_TUNER_CX24113 is not set
 # CONFIG_DVB_TDA826X is not set
-# CONFIG_DVB_TUA6100 is not set
-# CONFIG_DVB_CX24116 is not set
-# CONFIG_DVB_CX24117 is not set
-# CONFIG_DVB_CX24120 is not set
-# CONFIG_DVB_SI21XX is not set
 # CONFIG_DVB_TS2020 is not set
-# CONFIG_DVB_DS3000 is not set
-# CONFIG_DVB_MB86A16 is not set
-# CONFIG_DVB_TDA10071 is not set
-# CONFIG_DVB_SP887X is not set
+# CONFIG_DVB_TUA6100 is not set
+# CONFIG_DVB_TUNER_CX24113 is not set
+# CONFIG_DVB_TUNER_ITD1000 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_ZL10036 is not set
+# CONFIG_DVB_ZL10039 is not set
 # CONFIG_DVB_CX22700 is not set
 # CONFIG_DVB_CX22702 is not set
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRXD is not set
-# CONFIG_DVB_L64781 is not set
-# CONFIG_DVB_TDA1004X is not set
-# CONFIG_DVB_NXT6000 is not set
-# CONFIG_DVB_MT352 is not set
-# CONFIG_DVB_ZL10353 is not set
+# CONFIG_DVB_CXD2820R is not set
+# CONFIG_DVB_CXD2841ER is not set
 # CONFIG_DVB_DIB3000MB is not set
 # CONFIG_DVB_DIB3000MC is not set
 # CONFIG_DVB_DIB7000M is not set
 # CONFIG_DVB_DIB7000P is not set
 # CONFIG_DVB_DIB9000 is not set
-# CONFIG_DVB_TDA10048 is not set
+# CONFIG_DVB_DRXD is not set
 # CONFIG_DVB_EC100 is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_MT352 is not set
+# CONFIG_DVB_NXT6000 is not set
+# CONFIG_DVB_S5H1432 is not set
+# CONFIG_DVB_SP887X is not set
 # CONFIG_DVB_STV0367 is not set
-# CONFIG_DVB_CXD2820R is not set
-# CONFIG_DVB_CXD2841ER is not set
+# CONFIG_DVB_TDA10048 is not set
+# CONFIG_DVB_TDA1004X is not set
 # CONFIG_DVB_ZD1301_DEMOD is not set
+# CONFIG_DVB_ZL10353 is not set
 # CONFIG_DVB_CXD2880 is not set
-# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_STV0297 is not set
 # CONFIG_DVB_TDA10021 is not set
 # CONFIG_DVB_TDA10023 is not set
-# CONFIG_DVB_STV0297 is not set
-# CONFIG_DVB_NXT200X is not set
-# CONFIG_DVB_OR51211 is not set
-# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_AU8522_DTV is not set
+# CONFIG_DVB_AU8522_V4L is not set
 # CONFIG_DVB_BCM3510 is not set
-# CONFIG_DVB_LGDT330X is not set
-# CONFIG_DVB_LGDT3305 is not set
 # CONFIG_DVB_LG2160 is not set
+# CONFIG_DVB_LGDT3305 is not set
+# CONFIG_DVB_LGDT330X is not set
+# CONFIG_DVB_NXT200X is not set
+# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_OR51211 is not set
 # CONFIG_DVB_S5H1409 is not set
-# CONFIG_DVB_AU8522_DTV is not set
-# CONFIG_DVB_AU8522_V4L is not set
 # CONFIG_DVB_S5H1411 is not set
-# CONFIG_DVB_S921 is not set
 # CONFIG_DVB_DIB8000 is not set
 # CONFIG_DVB_MB86A20S is not set
-# CONFIG_DVB_TC90522 is not set
+# CONFIG_DVB_S921 is not set
 # CONFIG_DVB_MN88443X is not set
+# CONFIG_DVB_TC90522 is not set
 # CONFIG_DVB_PLL is not set
 # CONFIG_DVB_TUNER_DIB0070 is not set
 # CONFIG_DVB_TUNER_DIB0090 is not set
-# CONFIG_DVB_DRX39XYJ is not set
-# CONFIG_DVB_LNBH25 is not set
-# CONFIG_DVB_LNBH29 is not set
-# CONFIG_DVB_LNBP21 is not set
-# CONFIG_DVB_LNBP22 is not set
+# CONFIG_DVB_A8293 is not set
+# CONFIG_DVB_AF9033 is not set
+# CONFIG_DVB_ASCOT2E is not set
+# CONFIG_DVB_ATBM8830 is not set
+# CONFIG_DVB_HELENE is not set
+# CONFIG_DVB_HORUS3A is not set
 # CONFIG_DVB_ISL6405 is not set
 # CONFIG_DVB_ISL6421 is not set
 # CONFIG_DVB_ISL6423 is not set
-# CONFIG_DVB_A8293 is not set
+# CONFIG_DVB_IX2505V is not set
 # CONFIG_DVB_LGS8GL5 is not set
 # CONFIG_DVB_LGS8GXX is not set
-# CONFIG_DVB_ATBM8830 is not set
-# CONFIG_DVB_TDA665x is not set
-# CONFIG_DVB_IX2505V is not set
+# CONFIG_DVB_LNBH25 is not set
+# CONFIG_DVB_LNBH29 is not set
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_LNBP22 is not set
 # CONFIG_DVB_M88RS2000 is not set
-# CONFIG_DVB_AF9033 is not set
-# CONFIG_DVB_HORUS3A is not set
-# CONFIG_DVB_ASCOT2E is not set
-# CONFIG_DVB_HELENE is not set
+# CONFIG_DVB_TDA665x is not set
+# CONFIG_DVB_DRX39XYJ is not set
 # CONFIG_DVB_CXD2099 is not set
 # CONFIG_DVB_SP2 is not set
 CONFIG_DRM=m
@@ -538,6 +535,7 @@ CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
+CONFIG_CRYPTO_AES_ARM64_BS=m
 # CONFIG_CRYPTO_HW is not set
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=5
diff --git a/mix.exs b/mix.exs
index 1596dd2..9cac787 100644
--- a/mix.exs
+++ b/mix.exs
@@ -109,7 +109,7 @@ defmodule NervesSystemRpi4.MixProject do
       "fwup-revert.conf",
       "fwup.conf",
       "LICENSE",
-      "linux-5.15.defconfig",
+      "linux-6.1.defconfig",
       "mix.exs",
       "nerves_defconfig",
       "post-build.sh",
diff --git a/nerves_defconfig b/nerves_defconfig
index 0dadd58..3c28fce 100644
--- a/nerves_defconfig
+++ b/nerves_defconfig
@@ -28,10 +28,10 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERN
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20230106.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20230405.tar.gz"
 BR2_LINUX_KERNEL_PATCH="${NERVES_DEFCONFIG_DIR}/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-5.15.defconfig"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-6.1.defconfig"
 BR2_LINUX_KERNEL_XZ=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-400"
@@ -48,7 +48,7 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
 BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20230106"
+BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20230405"
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y
 BR2_PACKAGE_PIGPIO=y
 # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set

From 4d5f4d1041c05be111af358b92d14b3b270eca25 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Tue, 6 Jun 2023 08:11:01 -0400
Subject: [PATCH 7/9] Include CA certificates for OTP 26

---
 nerves_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nerves_defconfig b/nerves_defconfig
index 3c28fce..a5414d5 100644
--- a/nerves_defconfig
+++ b/nerves_defconfig
@@ -58,6 +58,7 @@ BR2_PACKAGE_RPI_USERLAND=y
 # BR2_PACKAGE_ALSA_LIB_SEQ is not set
 # BR2_PACKAGE_ALSA_LIB_ALISP is not set
 # BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS is not set
+BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBP11=y
 BR2_PACKAGE_UNIXODBC=y
 BR2_PACKAGE_DTC=y

From 60eea8a2e731140fab4b2a62e939b3f2fbc9f6e8 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Tue, 6 Jun 2023 08:20:07 -0400
Subject: [PATCH 8/9] nerves_system_br: bump to v1.23.0

---
 .circleci/config.yml |  4 ++--
 mix.exs              |  2 +-
 mix.lock             | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e65100..ef30d11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 exec: &exec
   name: build-tools/nerves-system-br
-  version: 1.22.5
-  elixir: 1.14.4-otp-25
+  version: 1.23.0
+  elixir: 1.14.5-otp-26
 
 version: 2.1
 
diff --git a/mix.exs b/mix.exs
index 9cac787..f0d183b 100644
--- a/mix.exs
+++ b/mix.exs
@@ -67,7 +67,7 @@ defmodule NervesSystemRpi4.MixProject do
   defp deps do
     [
       {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.15 or ~> 1.8", runtime: false},
-      {:nerves_system_br, "1.22.5", runtime: false},
+      {:nerves_system_br, "1.23.0", runtime: false},
       {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.8.0", runtime: false},
       {:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
       {:ex_doc, "~> 0.22", only: :docs, runtime: false}
diff --git a/mix.lock b/mix.lock
index f6c9f01..5583dde 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,16 +1,16 @@
 %{
-  "castore": {:hex, :castore, "1.0.1", "240b9edb4e9e94f8f56ab39d8d2d0a57f49e46c56aced8f873892df8ff64ff5a", [:mix], [], "hexpm", "b4951de93c224d44fac71614beabd88b71932d0b1dea80d2f80fb9044e01bbb3"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.31", "a93921cdc6b9b869f519213d5bc79d9e218ba768d7270d46fdcf1c01bacff9e2", [:mix], [], "hexpm", "317d367ee0335ef037a87e46c91a2269fef6306413f731e8ec11fc45a7efd059"},
-  "elixir_make": {:hex, :elixir_make, "0.7.6", "67716309dc5d43e16b5abbd00c01b8df6a0c2ab54a8f595468035a50189f9169", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5a0569756b0f7873a77687800c164cca6dfc03a09418e6fcf853d78991f49940"},
+  "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.32", "fa739a0ecfa34493de19426681b23f6814573faee95dfd4b4aafe15a7b5b32c6", [:mix], [], "hexpm", "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"},
+  "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
   "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
   "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
-  "nerves": {:hex, :nerves, "1.10.1", "e8dfd49efaa55d3be6facdc6c9eaad1f4f75d8e9f702a06ac4b0c276a0771747", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "85a6cc88b19c4652ed5c4b720639824885e9646291e4cb8bae504af1685ae28c"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.22.5", "56c514ed0f3e7ab00d070ad1946e58ccbad134711b8688c350ef9b3ce599e45d", [:mix], [], "hexpm", "ae5c0df668de14c4bfa0a965b0328ed2f96050e9ac14d94461e6dc97ac76eee2"},
+  "nerves": {:hex, :nerves, "1.10.2", "58393f1444e2828eeb92f1850c47ec1759c3dd9ae41d084fc966a491cfa14332", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "7218e725c71a115f10edb4da0365d77c353c161b29efb3b5e48fca272bc850d3"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.23.0", "d7c7eafc21664a87735cb0e13e8946457c282e6038dd2826271dd5140c9f95ed", [:mix], [], "hexpm", "d234d3e6fd251434d97cce2e73bf19a49d7ba94c637f2a0d35d063ae4e788e86"},
   "nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
   "nerves_toolchain_aarch64_nerves_linux_gnu": {:hex, :nerves_toolchain_aarch64_nerves_linux_gnu, "1.8.0", "40f7fe58737aaa9c6beee0e3599cca2265d1b4e40d7ab2713d7ad872349f21c2", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.9.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "c06a16b54634bbab7348ee7686e3b02574e0af742144c406b0f196b5b374349c"},
   "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.9.3", "60e87fde05988c4264babc8d68a9221c7b8fe5dc195b7d1526f29b8e626c735c", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2b6edb0687b7f78d3fa49958d759f647e351b23c1f59f637c617a6dc179994ae"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.3.0", "9e18a119d9efc3370a3ef2a937bf0b24c088d9c4bf0ba9d7c3751d49d347d035", [:mix], [], "hexpm", "7977f183127a7cbe9346981e2f480dc04c55ffddaef746bd58debd566070eef8"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
 }

From 8129124d08cc93e791e381e80eb081a8905ddea8 Mon Sep 17 00:00:00 2001
From: Eric Rauer <eric@rauer.dev>
Date: Thu, 15 Jun 2023 09:26:10 -0700
Subject: [PATCH 9/9] Add weston 12.01

---
 .github/workflows/main.yml |  4 ++--
 .tool-versions             |  5 +++--
 Config.in                  |  2 ++
 Dockerfile                 |  4 ++--
 PACKAGES-VERSION           |  2 +-
 linux-6.1.defconfig        |  4 ++--
 nerves_defconfig           | 21 ++++++---------------
 7 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3844963..66820ce 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,9 +5,9 @@ jobs:
   build:
     name: Build Nerves system
     runs-on: ubuntu-latest
-    container: ghcr.io/nerves-project/nerves_system_br:1.23.0 
+    container: nervesproject/nerves_system_br:1.22.3
     env:
-      ELIXIR_VERSION: 1.14.5-otp-26 
+      ELIXIR_VERSION: 1.14.2-otp-25 
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/.tool-versions b/.tool-versions
index f08de31..22b189e 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,3 @@
-elixir 1.14.5-otp-26
-erlang 26.0
+elixir 1.14.4-otp-25
+erlang 25.3.2
+
diff --git a/Config.in b/Config.in
index d3d6fa3..c1d5808 100644
--- a/Config.in
+++ b/Config.in
@@ -15,3 +15,5 @@ source "$NERVES_DEFCONFIG_DIR/package/openocd_cypress/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/pickle/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/acsccid_ly/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/plymouth/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/openocd_12/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/weston_12/Config.in"
diff --git a/Dockerfile b/Dockerfile
index 0831dd2..a29eec9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/nerves-project/nerves_system_br:1.23.0
+FROM nervesproject/nerves_system_br:1.22.3
 LABEL "com.github.actions.name"="Build System"
 LABEL "com.github.actions.description"="Build Nerves System"
 LABEL "com.github.actions.icon"="package"
@@ -8,7 +8,7 @@ LABEL "repository"="https://github.com/bcdevices/ly11-system-rpi4"
 LABEL "homepage"="https://github.com/bcdevices/ly11-system-rpi4"
 LABEL "maintainer"="Blue Clover Devices"
 
-ENV ELIXIR_VERSION=1.14.5-otp-26
+ENV ELIXIR_VERSION=1.14.2-otp-25
 
 RUN apt-get update && \
   apt install -y \
diff --git a/PACKAGES-VERSION b/PACKAGES-VERSION
index 6ca5d84..1bb2429 100644
--- a/PACKAGES-VERSION
+++ b/PACKAGES-VERSION
@@ -1 +1 @@
-0.18.11
+0.18.13
diff --git a/linux-6.1.defconfig b/linux-6.1.defconfig
index 40c410a..e786078 100644
--- a/linux-6.1.defconfig
+++ b/linux-6.1.defconfig
@@ -424,6 +424,7 @@ CONFIG_VIDEO_TC358743_CEC=y
 # CONFIG_DVB_CXD2099 is not set
 # CONFIG_DVB_SP2 is not set
 CONFIG_DRM=m
+# CONFIG_DRM_FBDEV_EMULATION is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
@@ -431,14 +432,13 @@ CONFIG_DRM_TOSHIBA_TC358762=m
 CONFIG_DRM_V3D=m
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
-CONFIG_DRM_SIMPLEDRM=m
-CONFIG_TINYDRM_REPAPER=m
 CONFIG_FB=y
 CONFIG_FB_BCM2708=y
 CONFIG_FB_RPISENSE=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_RPI=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
diff --git a/nerves_defconfig b/nerves_defconfig
index abeb3b2..a501927 100644
--- a/nerves_defconfig
+++ b/nerves_defconfig
@@ -48,7 +48,6 @@ BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_UNZIP=y
 BR2_PACKAGE_XZ=y
 BR2_PACKAGE_PV=y
-BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_E2FSPROGS_FSCK is not set
 BR2_PACKAGE_F2FS_TOOLS=y
@@ -61,11 +60,6 @@ BR2_PACKAGE_MESA3D=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
 BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_VULKAN_HEADERS=y
-BR2_PACKAGE_WESTON=y
-# BR2_PACKAGE_WESTON_SHELL_DESKTOP is not set
-# BR2_PACKAGE_WESTON_SHELL_FULLSCREEN is not set
-# BR2_PACKAGE_WESTON_SHELL_IVI is not set
-BR2_PACKAGE_WESTON_DEMO_CLIENTS=y
 BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
 BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
@@ -81,20 +75,13 @@ BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_PIGPIO=y
 # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set
 BR2_PACKAGE_UHUBCTL=y
-BR2_PACKAGE_USBUTILS=y
+BR2_PACKAGE_ERLANG_25=y
 BR2_PACKAGE_PYTHON3=y
 BR2_PACKAGE_PYTHON3_PY_PYC=y
 BR2_PACKAGE_PYTHON_ESPTOOL=y
 BR2_PACKAGE_PYTHON_PIP=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_CRYPTODEV=y
-BR2_PACKAGE_RPI_USERLAND=y
-# BR2_PACKAGE_ALSA_LIB_RAWMIDI is not set
-# BR2_PACKAGE_ALSA_LIB_HWDEP is not set
-# BR2_PACKAGE_ALSA_LIB_SEQ is not set
-# BR2_PACKAGE_ALSA_LIB_ALISP is not set
-# BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS is not set
-BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBP11=y
 BR2_PACKAGE_UNIXODBC=y
 BR2_PACKAGE_LIBGLFW=y
@@ -160,6 +147,10 @@ BR2_PACKAGE_OPENOCD_MAXIM=y
 BR2_PACKAGE_LIBFREEFARE_LY=y
 BR2_PACKAGE_OPENOCD_ZEPHYR=y
 BR2_PACKAGE_OPENOCD_CYPRESS=y
-BR2_PACKAGE_PICKLE=y
 BR2_PACKAGE_ACSCCID_LY=y
 BR2_PACKAGE_PLYMOUTH=y
+BR2_PACKAGE_WESTON_12=y
+# BR2_PACKAGE_WESTON_12_SHELL_DESKTOP is not set
+# BR2_PACKAGE_WESTON_12_SHELL_FULLSCREEN is not set
+# BR2_PACKAGE_WESTON_12_SHELL_IVI is not set
+BR2_PACKAGE_WESTON_12_DEMO_CLIENTS=y