Customizations for dev-68

nerves-keyboard · Oct 13, 2020 · 013c7fe · 013c7fe
1 parent 718e588
commit 013c7fe
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,2 @@
+elixir 1.10.4-otp-23
+erlang 23.0.3
diff --git a/README.md b/README.md
@@ -1,3 +1,9 @@
+# Customized
+
+This system is customized for the Dev-68 nerves keyboard development board. The
+primary branch is `dev-68` whereas `main` tracks upstream's main branch. To
+update, pull main from upstream and rebase `dev-68` on it.
+
 # Generic BeagleBone Support
 
 [![CircleCI](https://circleci.com/gh/nerves-project/nerves_system_bbb.svg?style=svg)](https://circleci.com/gh/nerves-project/nerves_system_bbb)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.7.2
+2.7.2+dev-68.1
diff --git a/fwup_include/provisioning.conf b/fwup_include/provisioning.conf
@@ -14,7 +14,7 @@ uboot_setenv(uboot-env, "nerves_serial_number", "\${NERVES_SERIAL_NUMBER}")
 uboot_setenv(uboot-env, "enable_uboot_overlays", "1")
 ###
 ###Overide capes with eeprom
-#uboot_setenv(uboot-env, "uboot_overlay_addr0", "/lib/firmware/<file0>.dtbo")
+uboot_setenv(uboot-env, "uboot_overlay_addr0", "/lib/firmware/BB-I2C1-00A0.dtbo")
 #uboot_setenv(uboot-env, "uboot_overlay_addr1", "/lib/firmware/<file1>.dtbo")
 #uboot_setenv(uboot-env, "uboot_overlay_addr2", "/lib/firmware/<file2>.dtbo")
 #uboot_setenv(uboot-env, "uboot_overlay_addr3", "/lib/firmware/<file3>.dtbo")
@@ -30,18 +30,18 @@ uboot_setenv(uboot-env, "enable_uboot_overlays", "1")
 ###
 ###Disable auto loading of virtual capes (emmc/video/wireless/adc)
 #uboot_setenv(uboot-env, "disable_uboot_overlay_emmc", "1")
-#uboot_setenv(uboot-env, "disable_uboot_overlay_video", "1")
-#uboot_setenv(uboot-env, "disable_uboot_overlay_audio", "1")
+uboot_setenv(uboot-env, "disable_uboot_overlay_video", "1")
+uboot_setenv(uboot-env, "disable_uboot_overlay_audio", "1")
 #uboot_setenv(uboot-env, "disable_uboot_overlay_wireless", "1")
-#uboot_setenv(uboot-env, "disable_uboot_overlay_adc", "1")
+uboot_setenv(uboot-env, "disable_uboot_overlay_adc", "1")
 ###
 ###PRUSS OPTIONS
 ###pru_rproc (4.4.x-ti kernel)
 #uboot_setenv(uboot-env, "uboot_overlay_pru", "/lib/firmware/AM335X-PRU-RPROC-4-4-TI-00A0.dtbo")
 ###pru_rproc (4.14.x-ti kernel)
 #uboot_setenv(uboot-env, "uboot_overlay_pru", "/lib/firmware/AM335X-PRU-RPROC-4-14-TI-00A0.dtbo")
 ###pru_uio (4.4.x-ti, 4.14.x-ti & mainline/bone kernel)
-uboot_setenv(uboot-env, "uboot_overlay_pru", "/lib/firmware/AM335X-PRU-UIO-00A0.dtbo")
+# uboot_setenv(uboot-env, "uboot_overlay_pru", "/lib/firmware/AM335X-PRU-UIO-00A0.dtbo")
 ###
 ###Cape Universal Enable
 uboot_setenv(uboot-env, "enable_uboot_cape_universal", "1")

diff --git a/linux/linux-4.19.defconfig b/linux/linux-4.19.defconfig
@@ -121,6 +121,7 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
+CONFIG_BONDING=y
 CONFIG_TUN=m
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 # CONFIG_NET_VENDOR_AMAZON is not set
@@ -238,7 +239,11 @@ CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_ETH=y
+CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_F_HID=y
 CONFIG_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NEW_LEDS=y

diff --git a/mix.exs b/mix.exs
@@ -1,8 +1,8 @@
-defmodule NervesSystemBbb.MixProject do
+defmodule NervesSystemDev68Bbb.MixProject do
   use Mix.Project
 
-  @github_organization "nerves-project"
-  @app :nerves_system_bbb
+  @github_organization "ElixirSeattle"
+  @app :nerves_system_dev_68_bbb
   @version Path.join(__DIR__, "VERSION")
            |> File.read!()
            |> String.trim()

diff --git a/nerves_defconfig b/nerves_defconfig
@@ -40,6 +40,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
 BR2_PACKAGE_LIBP11=y
 BR2_PACKAGE_UNIXODBC=y
+BR2_PACKAGE_LIBUSBGX=y
 BR2_PACKAGE_LIBMNL=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT=y