From 036e05e0af5be63560524955072ab345a8472646 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 2 Feb 2023 11:53:02 -0600 Subject: Use the proprietary driver for rs9113 in rs9113 mLinux images --- recipes-core/images/mlinux-base-image.bb | 8 ++++-- recipes-core/images/mlinux-commissioning-image.bb | 3 +- recipes-core/images/mlinux-mtrv1-image.bb | 3 +- recipes-core/images/mlinux-rs9113-base-image.bb | 6 ++++ recipes-core/images/mlinux-rs9113-factory-image.bb | 5 ++++ recipes-core/images/mlinux-rs9113-mtrv1-image.bb | 32 +++++++--------------- recipes-core/images/mlinux-sel-test-image.bb | 2 +- 7 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 recipes-core/images/mlinux-rs9113-base-image.bb diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb index cbf63f7..484a7c7 100644 --- a/recipes-core/images/mlinux-base-image.bb +++ b/recipes-core/images/mlinux-base-image.bb @@ -30,9 +30,14 @@ WIFI_FEATURES = " \ iw \ hostapd \ hostapd-cfg \ + wireless-regdb-static \ " -RSI_91X_FEATURES = " \ +# The rsi-91x open source driver +# does not work with WiFi + Bluetooth +# or WiFi station + WiFi access point +# This driver is experimental. +RSI_91X_FEATURES ??= " \ kernel-module-rsi-91x \ kernel-module-rsi-bt91x \ kernel-module-rsi-btusb \ @@ -42,7 +47,6 @@ RSI_91X_FEATURES = " \ rs9113-fw \ rsi-91x-fw \ rsi-91x-utils \ - wireless-regdb-static \ " RSI_91X_ADDITIONAL ??= "rsi-91x-autostart" diff --git a/recipes-core/images/mlinux-commissioning-image.bb b/recipes-core/images/mlinux-commissioning-image.bb index acef975..cb34b5a 100644 --- a/recipes-core/images/mlinux-commissioning-image.bb +++ b/recipes-core/images/mlinux-commissioning-image.bb @@ -2,6 +2,7 @@ require mlinux-rs9113-factory-image.bb DESCRIPTION = "mLinux factory image with commissioning support" # Extra stuff to install -IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python3-dbus commissioning commissioning-php-fpm rp-net-examples" +RSI_91X_FEATURES_append = " rs9113-rm" +IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python3-dbus commissioning commissioning-php-fpm " IMAGE_INSTALL_remove = "useradd" ROOTFS_POSTPROCESS_COMMAND_remove = "mlinux_set_root_password;" diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb index c2316b6..3368808 100644 --- a/recipes-core/images/mlinux-mtrv1-image.bb +++ b/recipes-core/images/mlinux-mtrv1-image.bb @@ -3,6 +3,7 @@ DESCRIPTION = "mLinux base mtr image" LICENSE = "MIT" require mlinux-minimal-image.bb +MULTITECH_MTAC = "" CONSOLE = "sysvinit-inittab-start-open" @@ -41,7 +42,7 @@ WIFI_FEATURES = " \ hostapd-cfg \ " -BLUETOOTH_FEATURES = "bluez5 bluez5-pand bluez5-mlinit" +BLUETOOTH_FEATURES = "" # Add all timezones available # ntpdate will sync time every 30 min by default via cron diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb new file mode 100644 index 0000000..1895b94 --- /dev/null +++ b/recipes-core/images/mlinux-rs9113-base-image.bb @@ -0,0 +1,6 @@ +require mlinux-base-image.bb +DESCRIPTION = "mLinux base image with rs9113 drivers" + +# Extra stuff to install +RSI_91X_FEATURES = " kernel-module-rs9113 rs9113-noarch rs9113-util" +RSI_91X_ADDITIONAL = " rs9113-autostart" diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb index f7134cf..63a8d95 100644 --- a/recipes-core/images/mlinux-rs9113-factory-image.bb +++ b/recipes-core/images/mlinux-rs9113-factory-image.bb @@ -1,5 +1,10 @@ require mlinux-factory-image.bb DESCRIPTION = "mLinux factory image with WiFi/BT related support packages" +# Use proprietary rs9113 driver which supports WiFi/BT together, and WiFi Station with +# WiFi Access Point +RSI_91X_FEATURES = "kernel-module-rs9113 rs9113-noarch rs9113-util rs9113-misc rs9113-utils-extra" +RSI_91X_ADDITIONAL = "rs9113-autostart" + # Extra stuff to install IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python3-dbus" diff --git a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb index 43b8e8d..b94f3e4 100644 --- a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb +++ b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb @@ -25,12 +25,14 @@ NETWORKING_FEATURES_append = " bridge-utils \ openssl \ rsync \ iperf3 \ - mii-diag \ - tcpdump \ - netcat \ - wget \ - strongswan \ - busybox-ifplugd \ + ppp-radioresetwait \ + radio-reset-background \ + mii-diag \ + tcpdump \ + netcat \ + wget \ + strongswan \ + busybox-ifplugd \ " WIFI_FEATURES = " \ @@ -41,7 +43,7 @@ WIFI_FEATURES = " \ hostapd-cfg \ " -BLUETOOTH_FEATURES = "bluez5 bluez5-pand" +BLUETOOTH_FEATURES = "bluez5 bluez5-pand bluez5-mlinit" # Add all timezones available # ntpdate will sync time every 30 min by default via cron @@ -69,21 +71,7 @@ MULTITECH_FEATURES_append = " \ MISC_FEATURES = "minicom lrzsz nano pps-tools" # Extra stuff to install - -RSI_91X_FEATURES = " \ - kernel-module-rsi-91x \ - kernel-module-rsi-bt91x \ - kernel-module-rsi-btusb \ - kernel-module-rsi-usb \ - kernel-module-rsi-91x-sta-ap \ - kernel-module-rsi-usb-sta-ap \ - rs9113-fw \ - rsi-91x-fw \ - rsi-91x-utils \ - wireless-regdb-static \ - " -RSI_91X_ADDITIONAL ??= "rsi-91x-autostart" - +IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113rf rs9113-util rs9113-noarch rs9113-utils-extra rs9113-misc rs9113-autostart" IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils" IMAGE_INSTALL_append = " uxfp qfirehose" diff --git a/recipes-core/images/mlinux-sel-test-image.bb b/recipes-core/images/mlinux-sel-test-image.bb index a871f74..e6ece7f 100644 --- a/recipes-core/images/mlinux-sel-test-image.bb +++ b/recipes-core/images/mlinux-sel-test-image.bb @@ -70,7 +70,7 @@ MULTITECH_FEATURES_append = " \ MISC_FEATURES = "minicom lrzsz nano pps-tools" # Extra stuff to install -# IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-util rs9113-autostart" +# IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-util rs9113-noarch rs9113-autostart" IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc" IMAGE_INSTALL_append = " \ -- cgit v1.2.3