PLTOS-229 Re-add pyOCD, generic CMSIS-DAP support (#79)

Config.in

@@ -1,19 +1,31 @@
-## Add project-specific packages for Buildroot here
 #
+## Add project-specific packages for Buildroot here
 # If these are non-proprietary, please consider contributing them back to
 # Nerves or Buildroot.
-source "$NERVES_DEFCONFIG_DIR/package/yubico_piv_tool/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/acsccid_ly/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/avrdude_ly/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/libfreefare_ly/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/libnfc_ly/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/openocd_11/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/openocd_12/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/openocd_cypress/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/openocd_esp32/Config.in"
-source "$NERVES_DEFCONFIG_DIR/package/openocd_pn7362/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/openocd_maxim/Config.in"
-source "$NERVES_DEFCONFIG_DIR/package/libfreefare_ly/Config.in"
-source "$NERVES_DEFCONFIG_DIR/package/libnfc_ly/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/openocd_pn7362/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/openocd_zephyr/Config.in"
-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/python-capstone/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-hidapi/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-importlib-metadata/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-importlib-resources/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-intervaltree/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-libusb-package/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-natsort/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-prettytable/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-pylink-square/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-pyocd/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-wheel/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/python-zipp/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/weston_12/Config.in"
+source "$NERVES_DEFCONFIG_DIR/package/yubico_piv_tool/Config.in"

PACKAGES-VERSION

@@ -1 +1 @@
-0.18.13
+0.18.15

VERSION

@@ -1 +1 @@
-0.24.0
+0.24.1

mix.exs

@@ -68,7 +68,7 @@ defmodule LY11SystemRpi4.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.23.0", runtime: false},
+      {:nerves_system_br, "1.23.1", 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}

mix.lock

@@ -3,12 +3,12 @@
   "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"},
+  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "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.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": {:hex, :nerves, "1.10.3", "31e29aaee9d9a4e7aa396a926d646c251cacf7c9e5f96b312dc23486dcd2231e", [: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", "84ff7f82bd9fb313af90bf5c6230825fa90f2e159d0355584a9d0ff1d29f4e56"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.23.1", "b48025ee2a31d57b3880df4a6d2212fd8ca117bdec6b35264f5d67b0c1edc9c4", [:mix], [], "hexpm", "f35c8aebe3f58c619d673a048330248dd3a8af30978852804aa112bc00183df8"},
   "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"},

nerves_defconfig

@@ -133,30 +133,33 @@ BR2_NERVES_ADDITIONAL_IMAGE_FILES="${NERVES_DEFCONFIG_DIR}/fwup.conf ${NERVES_DE
 BR2_PACKAGE_NBTTY=y
 BR2_PACKAGE_NERVES_CONFIG=y
 BR2_PACKAGE_RPI_DISTRO_FIRMWARE_NONFREE=y
-BR2_PACKAGE_YUBICO_PIV_TOOL=y
+BR2_PACKAGE_ACSCCID_LY=y
 BR2_PACKAGE_AVRDUDE_LY=y
+BR2_PACKAGE_LIBFREEFARE_LY=y
 BR2_PACKAGE_OPENOCD_11=y
 BR2_PACKAGE_OPENOCD_11_CMSIS_DAP=y
 BR2_PACKAGE_OPENOCD_11_FTDI=y
 BR2_PACKAGE_OPENOCD_11_STLINK=y
 BR2_PACKAGE_OPENOCD_11_JLINK=y
 BR2_PACKAGE_OPENOCD_11_XDS110=y
-BR2_PACKAGE_OPENOCD_ESP32=y
-BR2_PACKAGE_OPENOCD_PN7362=y
-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_OPENOCD_12=y
 BR2_PACKAGE_OPENOCD_12_CMSIS_DAP=y
 BR2_PACKAGE_OPENOCD_12_FTDI=y
 BR2_PACKAGE_OPENOCD_12_STLINK=y
 BR2_PACKAGE_OPENOCD_12_XDS110=y
+BR2_PACKAGE_OPENOCD_CYPRESS=y
+BR2_PACKAGE_OPENOCD_ESP32=y
+BR2_PACKAGE_OPENOCD_MAXIM=y
+BR2_PACKAGE_OPENOCD_PN7362=y
+BR2_PACKAGE_OPENOCD_ZEPHYR=y
+BR2_PACKAGE_PICKLE=y
+BR2_PACKAGE_PLYMOUTH=y
+BR2_PACKAGE_PYTHON_PYOCD=y
+BR2_PACKAGE_PYTHON_WHEEL=y
+BR2_PACKAGE_PYTHON_ZIPP=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
+BR2_PACKAGE_YUBICO_PIV_TOOL=y