summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-11-03 09:08:42 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-11-03 09:40:23 +0000
commit5983f5a52c7eef165244ad9c4b24c2a72479b2e9 (patch)
tree301fc8b3fc869894cd37a0c8daecb941d4f845be
parentfe4ba1d56c019ef8e6fce72acff3a7901ac142ea (diff)
downloadmeta-boot2qt-5983f5a52c7eef165244ad9c4b24c2a72479b2e9.tar.gz
patch kernel configs in correct phase
Change-Id: Id9854cebb7a82c310fff281dea97a6aac0d746f7 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
-rw-r--r--meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend2
-rw-r--r--meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend2
-rw-r--r--meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
index b696b19..f8fac0d 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
@@ -30,7 +30,7 @@
30# kernel image files are not needed in the image 30# kernel image files are not needed in the image
31RDEPENDS_kernel-base = "" 31RDEPENDS_kernel-base = ""
32 32
33do_configure_prepend () { 33do_preconfigure_prepend () {
34 # FunctionFS for adb 34 # FunctionFS for adb
35 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig 35 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
36 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig 36 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index dfc24a1..5a92f25 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -29,7 +29,7 @@
29 29
30RDEPENDS_kernel-base = "kernel-image kernel-devicetree" 30RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
31 31
32do_configure_prepend () { 32do_preconfigure_prepend () {
33 # FunctionFS for adb 33 # FunctionFS for adb
34 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig 34 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
35 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig 35 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
index 1bcbb80..574e60b 100644
--- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
+++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
@@ -34,7 +34,7 @@ SRC_URI += " \
34 file://0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch \ 34 file://0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch \
35 " 35 "
36 36
37do_configure_prepend() { 37do_preconfigure_prepend() {
38 sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \ 38 sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \
39 -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \ 39 -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
40 -i ${WORKDIR}/defconfig 40 -i ${WORKDIR}/defconfig