Customize for QMI

minifast · Nov 27, 2022 · 851f768 · 851f768
1 parent 2991f65
commit 851f768
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,30 +15,21 @@ workflows:
       - build-tools/get-br-dependencies:
           exec:
             <<: *exec
-          context: org-global
           filters:
             tags:
               only: /.*/
       - build-tools/build-system:
           exec:
             <<: *exec
           resource-class: large
-          context: org-global
           requires:
             - build-tools/get-br-dependencies
           filters:
             tags:
               only: /.*/
-      - build-tools/build-test:
-          exec:
-            <<: *exec
-          context: org-global
-          requires:
-            - build-tools/build-system
       - build-tools/deploy-system:
           exec:
             <<: *exec
-          context: org-global
           requires:
             - build-tools/build-system
           filters:

diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ erl_crash.dump
 /build.log
 /archive.log
 /.nerves
+Config.in
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,11 @@ follows:
    releases, and Linux kernel updates. They're also made to fix bugs and add
    features to the build infrastructure.
 
+## v1.21.2
+
+* Changes
+  * Enabled QMI
+
 ## v1.21.1
 
 * Changes

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.21.1
+1.21.2
diff --git a/busybox.fragment b/busybox.fragment
@@ -0,0 +1,2 @@
+CONFIG_MKNOD=y
+CONFIG_WC=y
diff --git a/linux-5.15.defconfig b/linux-5.15.defconfig
@@ -543,3 +543,7 @@ CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=5
 CONFIG_PRINTK_TIME=y
 CONFIG_PANIC_TIMEOUT=10
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
diff --git a/mix.exs b/mix.exs
@@ -1,8 +1,8 @@
-defmodule NervesSystemRpi4.MixProject do
+defmodule BusBeaconRpi4.MixProject do
   use Mix.Project
 
-  @github_organization "nerves-project"
-  @app :nerves_system_rpi4
+  @github_organization "minifast"
+  @app :bus_beacon_rpi4
   @source_url "https://github.com/#{@github_organization}/#{@app}"
   @version Path.join(__DIR__, "VERSION")
            |> File.read!()

diff --git a/nerves_defconfig b/nerves_defconfig
@@ -74,8 +74,10 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y
 BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_NERVES_SYSTEM_NAME="nerves_system_rpi4"
+BR2_NERVES_SYSTEM_NAME="bus_beacon_rpi4"
 BR2_NERVES_ADDITIONAL_IMAGE_FILES="${NERVES_DEFCONFIG_DIR}/fwup.conf ${NERVES_DEFCONFIG_DIR}/cmdline.txt ${NERVES_DEFCONFIG_DIR}/config.txt"
 BR2_PACKAGE_NBTTY=y
 BR2_PACKAGE_NERVES_CONFIG=y
 BR2_PACKAGE_RPI_DISTRO_FIRMWARE_NONFREE=y
+BR2_PACKAGE_USB_MODESWITCH=y
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="${NERVES_DEFCONFIG_DIR}/busybox.fragment"
diff --git a/test/mix.exs b/test/mix.exs
@@ -38,7 +38,7 @@ defmodule Test.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:nerves_system_rpi4, path: "../", runtime: false},
+      {:bus_beacon_rpi4, path: "../", runtime: false},
       {:shoehorn, "~> 0.6"},
       {:nerves_test_client, github: "mobileoverlord/nerves_test_client"}
     ]