aboutsummaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/recipes-bsp
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-02-16 03:07:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:40:06 +0000
commit7fc38ead6819e83e7e1bcc46b708067adf2ff2b5 (patch)
tree157d3ceba5bca6dec4329aa1855e0d34668bac1a /meta-yocto-bsp/recipes-bsp
parentbe7b52a7ccd5801a6dbd001c97990590ff434c21 (diff)
downloadpoky-7fc38ead6819e83e7e1bcc46b708067adf2ff2b5.tar.gz
poky-7fc38ead6819e83e7e1bcc46b708067adf2ff2b5.tar.bz2
poky-7fc38ead6819e83e7e1bcc46b708067adf2ff2b5.zip
gma500-gfx-check: Fixes infinite calling to modprobe gma500_gfx
The previous script caused an infinite call to modprobe gma500_gfx on certain situations, this fixes a typo and uses a new flag to avoid the infinite loop (From meta-yocto rev: 9a341596fd0cdf892e125b2eead7b5e334a590b4) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/recipes-bsp')
-rw-r--r--meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf2
-rw-r--r--meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
index 69f109e5fc..74d33c871f 100644
--- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
+++ b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
@@ -1,2 +1,2 @@
# Mimic modprobe's install funcitonality with busybox's modprobe
-install gma500_gfx lsmod | grep gma || { gma500_gfx_check.sh || modprobe gma500_gfx; }
+install gma500_gfx dmesg | grep gma500_gfx_checked || { /etc/modprobe.d/gma500-gfx-check.sh || modprobe gma500_gfx; }
diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
index 0c7b3aa14f..75cda99f54 100644
--- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
+++ b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
@@ -2,6 +2,10 @@
# Check for devices we wish to avoid gma500_gfx for
DEVICES="0x8119 0x4108"
+
+# Checked flag to avoid infinite modprobe
+echo "gma500_gfx_checked" >> /dev/kmsg;
+
for DEVICE in $DEVICES; do
if udevadm trigger --subsystem-match=pci --verbose --attr-match=device=$DEVICE | grep "pci" >> /dev/null ; then
echo "Found $DEVICE, avoiding gma500_gfx module" >> /dev/kmsg;