Need option driver for cellular modems

6 files changed, 300 insertions, 362 deletions

diff --git a/recipes-core/images/mlinux-mtr-image.bb b/recipes-core/images/mlinux-mtr-image.bb
index 878438f..bf56719 100644
--- a/recipes-core/images/mlinux-mtr-image.bb
+++ b/recipes-core/images/mlinux-mtr-image.bb
@@ -1,6 +1,5 @@
-# Conduit 0.0 or 0.1 without RS9113
 require mtr-modules.inc
-DESCRIPTION = "mLinux base image"
+DESCRIPTION = "mLinux base mtr image"
 LICENSE = "MIT"
 
 require mlinux-minimal-image.bb
diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb
deleted file mode 100644
index b4c494d..0000000
--- a/recipes-core/images/mlinux-mtrv1-image.bb
+++ /dev/null
@@ -1,69 +0,0 @@
-# Conduit 0.0 or 0.1 without RS9113
-require mtrv1-modules.inc
-DESCRIPTION = "mLinux base image"
-LICENSE = "MIT"
-
-require mlinux-minimal-image.bb
-MULTITECH_MTAC = ""
-
-FILESYSTEM_FEATURES = "dosfstools \
-                 cifs-utils \
-				 lsof \
-                 "
-
-NETWORKING_FEATURES += "bridge-utils \
-                       inetutils-ftp \
-                       openssl \
-                       rsync \
-                       iperf \
-					   mii-diag \
-					   tcpdump \
-					   netcat \
-					   wget \
-					   strongswan \
-					   busybox-ifplugd \
-                       "
-
-WIFI_FEATURES = " \
-                libnl \
-                wpa-supplicant \
-                wireless-tools \
-                iw \
-                hostap-daemon hostap-utils \
-                "
-
-BLUETOOTH_FEATURES = "bluez5"
-
-# Add all timezones available
-# ntpdate will sync time every 30 min by default via cron
-TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
-				 tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
-				 tzdata-misc \
-				 cronie \
-                 ntpdate \
-                 "
-
-# u-boot-linux-utils: U-Boot environment access from Linux
-# mlinux-scripts: sample scripts for setting up Conduit for various tasks
-# reset-handler: default reset button handler
-# radio-cmd: supports cellular radio activation and other configuration commands
-# radio-query: queries cellular radio for common info (IMEI, RSSI, etc)
-# jsparser: command line tool to parse JSON files
-MULTITECH_FEATURES += " \
-                     u-boot-linux-utils \
-                     mlinux-scripts \
-					 reset-handler \
-					 radio-cmd radio-query \
-					 jsparser \
-                     "
-
-MISC_FEATURES = "minicom lrzsz nano"
-
-# Extra stuff to install
-IMAGE_INSTALL += " \
-				${WIFI_FEATURES} \
-				${BLUETOOTH_FEATURES} \
-				${FILESYSTEM_FEATURES} \
-                ${TIME_FEATURES} \
-                ${MISC_FEATURES} \
-                "
diff --git a/recipes-core/images/mtcap-modules.inc b/recipes-core/images/mtcap-modules.inc
index 239c49b..b49f389 100644
--- a/recipes-core/images/mtcap-modules.inc
+++ b/recipes-core/images/mtcap-modules.inc
@@ -1,3 +1,10 @@
+# This file could be improved
+# by removing modules not needed
+# by MTR.  It could also be
+# improved by not includeing
+# modules that are dependency's
+# of other modules.
+
 IMAGE_INSTALL += " \
     kernel-module-8021q \
     kernel-module-af-alg \
@@ -189,6 +196,7 @@ IMAGE_INSTALL += " \
     kernel-module-nft-chain-nat-ipv4 \
     kernel-module-nft-exthdr \
     kernel-module-nft-meta \
+    kernel-module-option \
     kernel-module-p8022 \
     kernel-module-ppp-async \
     kernel-module-ppp-deflate \
diff --git a/recipes-core/images/mtr-base-modules.inc b/recipes-core/images/mtr-base-modules.inc
deleted file mode 100644
index 625b0f5..0000000
--- a/recipes-core/images/mtr-base-modules.inc
+++ /dev/null
@@ -1,283 +0,0 @@
-# Modules for mtrv1 and mtr
-
-IMAGE_INSTALL_append = " \
-    kernel-module-8021q \
-    kernel-module-af-alg \
-    kernel-module-algif-hash \
-    kernel-module-algif-skcipher \
-    kernel-module-ansi-cprng \
-    kernel-module-anubis \
-    kernel-module-arc4 \
-    kernel-module-asix \
-    kernel-module-at24 \
-    kernel-module-at91-udc \
-    kernel-module-atmel-mci \
-    kernel-module-atmel-usba-udc \
-    kernel-module-ax88179-178a \
-    kernel-module-bcm203x \
-    kernel-module-bfusb \
-    kernel-module-blowfish-common \
-    kernel-module-blowfish-generic \
-    kernel-module-bluetooth \
-    kernel-module-bnep \
-    kernel-module-bpa10x \
-    kernel-module-bridge \
-    kernel-module-br-netfilter \
-    kernel-module-bsd-comp \
-    kernel-module-btbcm \
-    kernel-module-btintel \
-    kernel-module-btmrvl \
-    kernel-module-btmrvl-sdio \
-    kernel-module-btqca \
-    kernel-module-btsdio \
-    kernel-module-cast5-generic \
-    kernel-module-cast6-generic \
-    kernel-module-cast-common \
-    kernel-module-catc \
-    kernel-module-ccm \
-    kernel-module-cdc-acm \
-    kernel-module-cdc-ether \
-    kernel-module-cdc-ncm \
-    kernel-module-cdc-subset \
-    kernel-module-cdc-wdm \
-    kernel-module-cfg80211 \
-    kernel-module-cmac \
-    kernel-module-cn \
-    kernel-module-crc32c-generic \
-    kernel-module-crc32-generic \
-    kernel-module-ctr \
-    kernel-module-cts \
-    kernel-module-dm9000 \
-    kernel-module-dm9601 \
-    kernel-module-dm-log \
-    kernel-module-dm-log-userspace \
-    kernel-module-dm-mirror \
-    kernel-module-dm-mod \
-    kernel-module-dm-region-hash \
-    kernel-module-dns-resolver \
-    kernel-module-dummy \
-    kernel-module-ecb \
-    kernel-module-eeprom-93cx6 \
-    kernel-module-encrypted-keys \
-    kernel-module-ext4 \
-    kernel-module-fcrypt \
-    kernel-module-fscrypto \
-    kernel-module-g-acm-ms \
-    kernel-module-gadgetfs \
-    kernel-module-garp \
-    kernel-module-g-cdc \
-    kernel-module-gcm \
-    kernel-module-g-ether \
-    kernel-module-gf128mul \
-    kernel-module-ghash-generic \
-    kernel-module-gluebi \
-    kernel-module-g-mass-storage \
-    kernel-module-g-serial \
-    kernel-module-g-zero \
-    kernel-module-hci-uart \
-    kernel-module-hci-vhci \
-    kernel-module-hidp \
-    kernel-module-i2c-at91 \
-    kernel-module-i2c-dev \
-    kernel-module-i2c-gpio \
-    kernel-module-i2c-slave-eeprom \
-    kernel-module-ip6-gre \
-    kernel-module-ip6table-filter \
-    kernel-module-ip6table-mangle \
-    kernel-module-ip6table-nat \
-    kernel-module-ip6table-raw \
-    kernel-module-ip6-tables \
-    kernel-module-ip6t-ah \
-    kernel-module-ip6t-eui64 \
-    kernel-module-ip6t-frag \
-    kernel-module-ip6t-hbh \
-    kernel-module-ip6t-ipv6header \
-    kernel-module-ip6t-masquerade \
-    kernel-module-ip6t-mh \
-    kernel-module-ip6t-npt \
-    kernel-module-ip6t-reject \
-    kernel-module-ip6t-rpfilter \
-    kernel-module-ip6t-rt \
-    kernel-module-ip6t-synproxy \
-    kernel-module-ip6-tunnel \
-    kernel-module-ip6-udp-tunnel \
-    kernel-module-ip6-vti \
-    kernel-module-ipip \
-    kernel-module-iptable-filter \
-    kernel-module-iptable-mangle \
-    kernel-module-iptable-nat \
-    kernel-module-iptable-raw \
-    kernel-module-ip-tables \
-    kernel-module-ipt-ah \
-    kernel-module-ipt-clusterip \
-    kernel-module-ipt-ecn \
-    kernel-module-ipt-masquerade \
-    kernel-module-ipt-reject \
-    kernel-module-ipt-rpfilter \
-    kernel-module-ipt-synproxy \
-    kernel-module-ip-vs \
-    kernel-module-iscsi-tcp \
-    kernel-module-jbd2 \
-    kernel-module-khazad \
-    kernel-module-l2tp-core \
-    kernel-module-l2tp-ppp \
-    kernel-module-leds-blinkm \
-    kernel-module-leds-regulator \
-    kernel-module-ledtrig-default-on \
-    kernel-module-ledtrig-gpio \
-    kernel-module-ledtrig-heartbeat \
-    kernel-module-ledtrig-netdev \
-    kernel-module-ledtrig-timer \
-    kernel-module-ledtrig-usbport \
-    kernel-module-libcomposite \
-    kernel-module-libiscsi \
-    kernel-module-libiscsi-tcp \
-    kernel-module-llc \
-    kernel-module-mac80211 \
-    kernel-module-mbcache \
-    kernel-module-md4 \
-    kernel-module-micrel \
-    kernel-module-microchip \
-    kernel-module-mii \
-    kernel-module-mrp \
-    kernel-module-mtd-dataflash \
-    kernel-module-mtd-nandbiterrs \
-    kernel-module-mtd-nandecctest \
-    kernel-module-mtd-oobtest \
-    kernel-module-mtd-pagetest \
-    kernel-module-mtd-readtest \
-    kernel-module-mtd-speedtest \
-    kernel-module-mtd-stresstest \
-    kernel-module-mtd-subpagetest \
-    kernel-module-mtd-torturetest \
-    kernel-module-nf-conntrack-broadcast \
-    kernel-module-nf-conntrack-ftp \
-    kernel-module-nf-conntrack-h323 \
-    kernel-module-nf-conntrack-ipv4 \
-    kernel-module-nf-conntrack-ipv6 \
-    kernel-module-nf-conntrack-netbios-ns \
-    kernel-module-nf-conntrack-netlink \
-    kernel-module-nf-conntrack-pptp \
-    kernel-module-nf-conntrack-proto-gre \
-    kernel-module-nf-conntrack-sip \
-    kernel-module-nf-conntrack-snmp \
-    kernel-module-nf-defrag-ipv4 \
-    kernel-module-nf-defrag-ipv6 \
-    kernel-module-nf-dup-ipv4 \
-    kernel-module-nf-dup-ipv6 \
-    kernel-module-nf-log-arp \
-    kernel-module-nf-log-common \
-    kernel-module-nf-log-ipv4 \
-    kernel-module-nf-log-ipv6 \
-    kernel-module-nf-nat-ftp \
-    kernel-module-nf-nat-h323 \
-    kernel-module-nf-nat-ipv4 \
-    kernel-module-nf-nat-ipv6 \
-    kernel-module-nf-nat-masquerade-ipv4 \
-    kernel-module-nf-nat-masquerade-ipv6 \
-    kernel-module-nf-nat-pptp \
-    kernel-module-nf-nat-proto-gre \
-    kernel-module-nf-nat-redirect \
-    kernel-module-nf-nat-sip \
-    kernel-module-nf-nat-snmp-basic \
-    kernel-module-nfnetlink-cttimeout \
-    kernel-module-nf-reject-ipv4 \
-    kernel-module-nf-reject-ipv6 \
-    kernel-module-nf-synproxy-core \
-    kernel-module-nf-tables-inet \
-    kernel-module-nf-tables-ipv4 \
-    kernel-module-nf-tables-ipv6 \
-    kernel-module-nf-tables-netdev \
-    kernel-module-nft-chain-nat-ipv4 \
-    kernel-module-nft-exthdr \
-    kernel-module-nft-meta \
-    kernel-module-p8022 \
-    kernel-module-ppp-async \
-    kernel-module-ppp-deflate \
-    kernel-module-ppp-generic \
-    kernel-module-ppp-mppe \
-    kernel-module-pppoe \
-    kernel-module-pppox \
-    kernel-module-pps-core \
-    kernel-module-pps-gpio \
-    kernel-module-pps-ktimer \
-    kernel-module-pps-ldisc \
-    kernel-module-pptp \
-    kernel-module-psnap \
-    kernel-module-ptp \
-    kernel-module-pwm-atmel-tcb \
-    kernel-module-qmi-wwan \
-    kernel-module-rfcomm \
-    kernel-module-rfkill \
-    kernel-module-rfkill-gpio \
-    kernel-module-rfkill-regulator \
-    kernel-module-rndis-host \
-    kernel-module-rndis-wlan \
-    kernel-module-salsa20-generic \
-    kernel-module-scsi-transport-iscsi \
-    kernel-module-seed \
-    kernel-module-seqiv \
-    kernel-module-serpent-generic \
-    kernel-module-sha512-generic \
-    kernel-module-sit \
-    kernel-module-slhc \
-    kernel-module-spi-atmel \
-    kernel-module-spidev \
-    kernel-module-spi-nor \
-    kernel-module-stp \
-    kernel-module-tea \
-    kernel-module-tun \
-    kernel-module-twofish-common \
-    kernel-module-twofish-generic \
-    kernel-module-udc-core \
-    kernel-module-udp-tunnel \
-    kernel-module-u-ether \
-    kernel-module-uio \
-    kernel-module-uio-pdrv-genirq \
-    kernel-module-usb-f-acm \
-    kernel-module-usb-f-ecm \
-    kernel-module-usb-f-ecm-subset \
-    kernel-module-usb-f-mass-storage \
-    kernel-module-usb-f-obex \
-    kernel-module-usb-f-rndis \
-    kernel-module-usb-f-serial \
-    kernel-module-usb-f-ss-lb \
-    kernel-module-usbmon \
-    kernel-module-usbnet \
-    kernel-module-usbserial \
-    kernel-module-usb-serial-simple \
-    kernel-module-usb-storage \
-    kernel-module-u-serial \
-    kernel-module-xfrm6-mode-tunnel \
-    kernel-module-x-tables \
-    kernel-module-xt-classify \
-    kernel-module-xt-connmark \
-    kernel-module-xt-conntrack \
-    kernel-module-xt-ct \
-    kernel-module-xt-ecn \
-    kernel-module-xt-esp \
-    kernel-module-xt-hashlimit \
-    kernel-module-xt-hl \
-    kernel-module-xt-iprange \
-    kernel-module-xt-l2tp \
-    kernel-module-xt-led \
-    kernel-module-xt-limit \
-    kernel-module-xt-log \
-    kernel-module-xt-mac \
-    kernel-module-xt-mark \
-    kernel-module-xt-multiport \
-    kernel-module-xt-nat \
-    kernel-module-xt-netmap \
-    kernel-module-xt-nflog \
-    kernel-module-xt-nfqueue \
-    kernel-module-xt-policy \
-    kernel-module-xt-recent \
-    kernel-module-xt-redirect \
-    kernel-module-xts \
-    kernel-module-xt-set \
-    kernel-module-xt-state \
-    kernel-module-xt-tcpudp \
-    kernel-module-xt-tee \
-    kernel-module-xt-time \
-    kernel-module-xt-tproxy \
-"
diff --git a/recipes-core/images/mtr-modules.inc b/recipes-core/images/mtr-modules.inc
index f8b197a..8facc37 100644
--- a/recipes-core/images/mtr-modules.inc
+++ b/recipes-core/images/mtr-modules.inc
@@ -1,7 +1,296 @@
-require mtr-base-modules.inc
+# This file could be improved
+# by removing modules not needed
+# by MTR.  It could also be
+# improved by not includeing
+# modules that are dependency's
+# of other modules.
 
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL_append_mtr = "\
     kernel-module-wl12xx \
     kernel-module-wlcore \
     kernel-module-wlcore-sdio \
 "
+# Modules for mtrv1 and mtr
+
+IMAGE_INSTALL_append = " \
+    kernel-module-8021q \
+    kernel-module-af-alg \
+    kernel-module-algif-hash \
+    kernel-module-algif-skcipher \
+    kernel-module-ansi-cprng \
+    kernel-module-anubis \
+    kernel-module-arc4 \
+    kernel-module-asix \
+    kernel-module-at24 \
+    kernel-module-at91-udc \
+    kernel-module-atmel-mci \
+    kernel-module-atmel-usba-udc \
+    kernel-module-ax88179-178a \
+    kernel-module-bcm203x \
+    kernel-module-bfusb \
+    kernel-module-blowfish-common \
+    kernel-module-blowfish-generic \
+    kernel-module-bluetooth \
+    kernel-module-bnep \
+    kernel-module-bpa10x \
+    kernel-module-bridge \
+    kernel-module-br-netfilter \
+    kernel-module-bsd-comp \
+    kernel-module-btbcm \
+    kernel-module-btintel \
+    kernel-module-btmrvl \
+    kernel-module-btmrvl-sdio \
+    kernel-module-btqca \
+    kernel-module-btsdio \
+    kernel-module-cast5-generic \
+    kernel-module-cast6-generic \
+    kernel-module-cast-common \
+    kernel-module-catc \
+    kernel-module-ccm \
+    kernel-module-cdc-acm \
+    kernel-module-cdc-ether \
+    kernel-module-cdc-ncm \
+    kernel-module-cdc-subset \
+    kernel-module-cdc-wdm \
+    kernel-module-cfg80211 \
+    kernel-module-cmac \
+    kernel-module-cn \
+    kernel-module-crc32c-generic \
+    kernel-module-crc32-generic \
+    kernel-module-ctr \
+    kernel-module-cts \
+    kernel-module-dm9000 \
+    kernel-module-dm9601 \
+    kernel-module-dm-log \
+    kernel-module-dm-log-userspace \
+    kernel-module-dm-mirror \
+    kernel-module-dm-mod \
+    kernel-module-dm-region-hash \
+    kernel-module-dns-resolver \
+    kernel-module-dummy \
+    kernel-module-ecb \
+    kernel-module-eeprom-93cx6 \
+    kernel-module-encrypted-keys \
+    kernel-module-ext4 \
+    kernel-module-fcrypt \
+    kernel-module-fscrypto \
+    kernel-module-g-acm-ms \
+    kernel-module-gadgetfs \
+    kernel-module-garp \
+    kernel-module-g-cdc \
+    kernel-module-gcm \
+    kernel-module-g-ether \
+    kernel-module-gf128mul \
+    kernel-module-ghash-generic \
+    kernel-module-gluebi \
+    kernel-module-g-mass-storage \
+    kernel-module-g-serial \
+    kernel-module-g-zero \
+    kernel-module-hci-uart \
+    kernel-module-hci-vhci \
+    kernel-module-hidp \
+    kernel-module-i2c-at91 \
+    kernel-module-i2c-dev \
+    kernel-module-i2c-gpio \
+    kernel-module-i2c-slave-eeprom \
+    kernel-module-ip6-gre \
+    kernel-module-ip6table-filter \
+    kernel-module-ip6table-mangle \
+    kernel-module-ip6table-nat \
+    kernel-module-ip6table-raw \
+    kernel-module-ip6-tables \
+    kernel-module-ip6t-ah \
+    kernel-module-ip6t-eui64 \
+    kernel-module-ip6t-frag \
+    kernel-module-ip6t-hbh \
+    kernel-module-ip6t-ipv6header \
+    kernel-module-ip6t-masquerade \
+    kernel-module-ip6t-mh \
+    kernel-module-ip6t-npt \
+    kernel-module-ip6t-reject \
+    kernel-module-ip6t-rpfilter \
+    kernel-module-ip6t-rt \
+    kernel-module-ip6t-synproxy \
+    kernel-module-ip6-tunnel \
+    kernel-module-ip6-udp-tunnel \
+    kernel-module-ip6-vti \
+    kernel-module-ipip \
+    kernel-module-iptable-filter \
+    kernel-module-iptable-mangle \
+    kernel-module-iptable-nat \
+    kernel-module-iptable-raw \
+    kernel-module-ip-tables \
+    kernel-module-ipt-ah \
+    kernel-module-ipt-clusterip \
+    kernel-module-ipt-ecn \
+    kernel-module-ipt-masquerade \
+    kernel-module-ipt-reject \
+    kernel-module-ipt-rpfilter \
+    kernel-module-ipt-synproxy \
+    kernel-module-ip-vs \
+    kernel-module-iscsi-tcp \
+    kernel-module-jbd2 \
+    kernel-module-khazad \
+    kernel-module-l2tp-core \
+    kernel-module-l2tp-ppp \
+    kernel-module-leds-blinkm \
+    kernel-module-leds-regulator \
+    kernel-module-ledtrig-default-on \
+    kernel-module-ledtrig-gpio \
+    kernel-module-ledtrig-heartbeat \
+    kernel-module-ledtrig-netdev \
+    kernel-module-ledtrig-timer \
+    kernel-module-ledtrig-usbport \
+    kernel-module-libcomposite \
+    kernel-module-libiscsi \
+    kernel-module-libiscsi-tcp \
+    kernel-module-llc \
+    kernel-module-mac80211 \
+    kernel-module-mbcache \
+    kernel-module-md4 \
+    kernel-module-micrel \
+    kernel-module-microchip \
+    kernel-module-mii \
+    kernel-module-mrp \
+    kernel-module-mtd-dataflash \
+    kernel-module-mtd-nandbiterrs \
+    kernel-module-mtd-nandecctest \
+    kernel-module-mtd-oobtest \
+    kernel-module-mtd-pagetest \
+    kernel-module-mtd-readtest \
+    kernel-module-mtd-speedtest \
+    kernel-module-mtd-stresstest \
+    kernel-module-mtd-subpagetest \
+    kernel-module-mtd-torturetest \
+    kernel-module-nf-conntrack-broadcast \
+    kernel-module-nf-conntrack-ftp \
+    kernel-module-nf-conntrack-h323 \
+    kernel-module-nf-conntrack-ipv4 \
+    kernel-module-nf-conntrack-ipv6 \
+    kernel-module-nf-conntrack-netbios-ns \
+    kernel-module-nf-conntrack-netlink \
+    kernel-module-nf-conntrack-pptp \
+    kernel-module-nf-conntrack-proto-gre \
+    kernel-module-nf-conntrack-sip \
+    kernel-module-nf-conntrack-snmp \
+    kernel-module-nf-defrag-ipv4 \
+    kernel-module-nf-defrag-ipv6 \
+    kernel-module-nf-dup-ipv4 \
+    kernel-module-nf-dup-ipv6 \
+    kernel-module-nf-log-arp \
+    kernel-module-nf-log-common \
+    kernel-module-nf-log-ipv4 \
+    kernel-module-nf-log-ipv6 \
+    kernel-module-nf-nat-ftp \
+    kernel-module-nf-nat-h323 \
+    kernel-module-nf-nat-ipv4 \
+    kernel-module-nf-nat-ipv6 \
+    kernel-module-nf-nat-masquerade-ipv4 \
+    kernel-module-nf-nat-masquerade-ipv6 \
+    kernel-module-nf-nat-pptp \
+    kernel-module-nf-nat-proto-gre \
+    kernel-module-nf-nat-redirect \
+    kernel-module-nf-nat-sip \
+    kernel-module-nf-nat-snmp-basic \
+    kernel-module-nfnetlink-cttimeout \
+    kernel-module-nf-reject-ipv4 \
+    kernel-module-nf-reject-ipv6 \
+    kernel-module-nf-synproxy-core \
+    kernel-module-nf-tables-inet \
+    kernel-module-nf-tables-ipv4 \
+    kernel-module-nf-tables-ipv6 \
+    kernel-module-nf-tables-netdev \
+    kernel-module-nft-chain-nat-ipv4 \
+    kernel-module-nft-exthdr \
+    kernel-module-nft-meta \
+    kernel-module-option \
+    kernel-module-p8022 \
+    kernel-module-ppp-async \
+    kernel-module-ppp-deflate \
+    kernel-module-ppp-generic \
+    kernel-module-ppp-mppe \
+    kernel-module-pppoe \
+    kernel-module-pppox \
+    kernel-module-pps-core \
+    kernel-module-pps-gpio \
+    kernel-module-pps-ktimer \
+    kernel-module-pps-ldisc \
+    kernel-module-pptp \
+    kernel-module-psnap \
+    kernel-module-ptp \
+    kernel-module-pwm-atmel-tcb \
+    kernel-module-qmi-wwan \
+    kernel-module-rfcomm \
+    kernel-module-rfkill \
+    kernel-module-rfkill-gpio \
+    kernel-module-rfkill-regulator \
+    kernel-module-rndis-host \
+    kernel-module-rndis-wlan \
+    kernel-module-salsa20-generic \
+    kernel-module-scsi-transport-iscsi \
+    kernel-module-seed \
+    kernel-module-seqiv \
+    kernel-module-serpent-generic \
+    kernel-module-sha512-generic \
+    kernel-module-sit \
+    kernel-module-slhc \
+    kernel-module-spi-atmel \
+    kernel-module-spidev \
+    kernel-module-spi-nor \
+    kernel-module-stp \
+    kernel-module-tea \
+    kernel-module-tun \
+    kernel-module-twofish-common \
+    kernel-module-twofish-generic \
+    kernel-module-udc-core \
+    kernel-module-udp-tunnel \
+    kernel-module-u-ether \
+    kernel-module-uio \
+    kernel-module-uio-pdrv-genirq \
+    kernel-module-usb-f-acm \
+    kernel-module-usb-f-ecm \
+    kernel-module-usb-f-ecm-subset \
+    kernel-module-usb-f-mass-storage \
+    kernel-module-usb-f-obex \
+    kernel-module-usb-f-rndis \
+    kernel-module-usb-f-serial \
+    kernel-module-usb-f-ss-lb \
+    kernel-module-usbmon \
+    kernel-module-usbnet \
+    kernel-module-usbserial \
+    kernel-module-usb-serial-simple \
+    kernel-module-usb-storage \
+    kernel-module-u-serial \
+    kernel-module-xfrm6-mode-tunnel \
+    kernel-module-x-tables \
+    kernel-module-xt-classify \
+    kernel-module-xt-connmark \
+    kernel-module-xt-conntrack \
+    kernel-module-xt-ct \
+    kernel-module-xt-ecn \
+    kernel-module-xt-esp \
+    kernel-module-xt-hashlimit \
+    kernel-module-xt-hl \
+    kernel-module-xt-iprange \
+    kernel-module-xt-l2tp \
+    kernel-module-xt-led \
+    kernel-module-xt-limit \
+    kernel-module-xt-log \
+    kernel-module-xt-mac \
+    kernel-module-xt-mark \
+    kernel-module-xt-multiport \
+    kernel-module-xt-nat \
+    kernel-module-xt-netmap \
+    kernel-module-xt-nflog \
+    kernel-module-xt-nfqueue \
+    kernel-module-xt-policy \
+    kernel-module-xt-recent \
+    kernel-module-xt-redirect \
+    kernel-module-xts \
+    kernel-module-xt-set \
+    kernel-module-xt-state \
+    kernel-module-xt-tcpudp \
+    kernel-module-xt-tee \
+    kernel-module-xt-time \
+    kernel-module-xt-tproxy \
+"
diff --git a/recipes-core/images/mtrv1-modules.inc b/recipes-core/images/mtrv1-modules.inc
deleted file mode 100644
index 257f639..0000000
--- a/recipes-core/images/mtrv1-modules.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Modules not to be included in
-# the original MTR image.
-
-require mtr-base-modules.inc
-
-#IMAGE_INSTALL += = " "