aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/qemux86-64.conf1
-rw-r--r--meta/recipes-kernel/linux/linux-yocto/bt.cfg12
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.1.bb3
4 files changed, 16 insertions, 2 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 49073a730ad..ede9e982c28 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -11,7 +11,7 @@ XSERVER ?= "xserver-xorg \
xf86-video-fbdev \
xf86-input-keyboard"
-MACHINE_FEATURES = "alsa bluetooth usbhost usbgadget screen"
+MACHINE_FEATURES = "alsa bluetooth usbhost usbgadget wifi screen"
MACHINEOVERRIDES =. "qemuall:"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 489194aa6e6..aa8acd1ea88 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -27,3 +27,4 @@ XSERVER = "xserver-xorg \
MACHINE_FEATURES += "x86"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware"
diff --git a/meta/recipes-kernel/linux/linux-yocto/bt.cfg b/meta/recipes-kernel/linux/linux-yocto/bt.cfg
new file mode 100644
index 00000000000..dc66cc613d2
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto/bt.cfg
@@ -0,0 +1,12 @@
+CONFIG_BT_HCIUSB=y
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIBTUSB=y
+CONFIG_BT_HCIBTSDIO=y
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_LE=y
+CONFIG_STAGING=y
+CONFIG_R8712U=y
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index b81458b3c05..dba95300f20 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -22,7 +22,8 @@ SRCREV_machine ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51"
SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
- git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA} \
+ file://bt.cfg"
LINUX_VERSION ?= "4.1.15"