Update for 4G HAT and debugging

* enable USB networking modules * enable IEx output to HDMI * disable USB gadget mode Signed-off-by: Van Nieri <[email protected]>
minifast · Feb 23, 2023 · 0da419c · 0da419c
1 parent c8278eb
commit 0da419c
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 18 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/cmdline.txt b/cmdline.txt
@@ -9,3 +9,4 @@
 #    make changes permanent, you'll need to override the fwup.conf.
 # 5. See https://www.raspberrypi.org/documentation/configuration/cmdline-txt.md
 root=/dev/mmcblk0p2 rootwait console=serial0,115200 quiet
+console=tty1 fbcon=scrollback:1024k consoleblank=0
diff --git a/config.txt b/config.txt
@@ -28,7 +28,7 @@ dtparam=audio=on
 # NOTE: check that the overlay that you specify is in the boot partition or
 #       this won't work.
 #dtoverlay=w1-gpio-pullup,gpiopin=4
-dtoverlay=dwc2
+#dtoverlay=dwc2
 
 # The ramoops overlay works with the pstore driver to preserve crash
 # information across reboots in DRAM

diff --git a/linux-5.15.defconfig b/linux-5.15.defconfig
@@ -410,3 +410,12 @@ 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
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_WDM=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_DRIVERS=m
diff --git a/mix.exs b/mix.exs
@@ -1,8 +1,8 @@
-defmodule NervesSystemRpi0.MixProject do
+defmodule BusBeaconRpi0.MixProject do
   use Mix.Project
 
-  @github_organization "nerves-project"
-  @app :nerves_system_rpi0
+  @github_organization "minifast"
+  @app :bus_beacon_rpi0
   @source_url "https://github.com/#{@github_organization}/#{@app}"
   @version Path.join(__DIR__, "VERSION")
            |> File.read!()
@@ -67,7 +67,7 @@ defmodule NervesSystemRpi0.MixProject do
   defp deps do
     [
       {:nerves, "~> 1.6.0 or ~> 1.7.15 or ~> 1.8", runtime: false},
-      {:nerves_system_br, "1.22.2", runtime: false},
+      {:nerves_system_br, "1.22.3", runtime: false},
       {:nerves_toolchain_armv6_nerves_linux_gnueabihf, "~> 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/nerves_defconfig b/nerves_defconfig
@@ -70,7 +70,7 @@ 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_rpi0"
+BR2_NERVES_SYSTEM_NAME="bus_beacon_rpi0"
 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

diff --git a/rootfs_overlay/etc/erlinit.config b/rootfs_overlay/etc/erlinit.config
@@ -9,8 +9,8 @@
 
 # Specify where erlinit should send the IEx prompt. Only one may be enabled at
 # a time.
--c ttyAMA0     # UART pins on the GPIO connector
-# -c tty1      # HDMI output
+# -c ttyAMA0     # UART pins on the GPIO connector
+-c tty1      # HDMI output
 
 # If more than one tty are available, always warn if the user is looking at the
 # wrong one.

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_rpi0, path: "../", runtime: false},
+      {:bus_beacon_rpi0, path: "../", runtime: false},
       {:shoehorn, "~> 0.6"},
       {:nerves_test_client, github: "mobileoverlord/nerves_test_client"}
     ]