intel wifi, kernel patch

diff --git a/configs/merica-terminal_defconfig b/configs/merica-terminal_defconfig
index 3793333de0451c61008f832fbd9aee97bc2caf5e..037a174db3474b5eeb00c1581cacfeff37b0c55c 100644 (file)
--- a/configs/merica-terminal_defconfig
+++ b/configs/merica-terminal_defconfig
@@ -20,11 +20,11 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ADVANTECH-Corp/linux-imx6.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="imx_4.9.11_1.0.0_ga"
+BR2_LINUX_KERNEL_PATCH="board/advantech/imx6q-rsb4411-a1/patches/kernel"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/advantech/imx6q-rsb4411-a1/imx_v7_adv_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="merica-terminal"
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/advantech/imx6q-rsb4411-a1/merica-terminal.dts"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-rsb4411-a1"
 BR2_PACKAGE_GSTREAMER1=y
 BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER=y
 BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP=y
@@ -193,7 +193,8 @@ BR2_PACKAGE_QT5WEBENGINE=y
 BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y
 BR2_PACKAGE_QT5WEBENGINE_ALSA=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y
+BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
+BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y
 BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA=y
 BR2_PACKAGE_FREESCALE_IMX=y
 BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y