diff options
| -rwxr-xr-x | recipes-bsp/multitech/mt-dt-overlay/init | 26 | ||||
| -rw-r--r-- | recipes-bsp/multitech/mt-dt-overlay_1.1.2.bb | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/recipes-bsp/multitech/mt-dt-overlay/init b/recipes-bsp/multitech/mt-dt-overlay/init index 2112edc..00af9f8 100755 --- a/recipes-bsp/multitech/mt-dt-overlay/init +++ b/recipes-bsp/multitech/mt-dt-overlay/init @@ -49,14 +49,17 @@ install_dtbo_dir() { # [flag] # [file1] [file2] [file3] setdevtree() { - hwlin=$(mts-id-eeprom --in-file "$eepromPath" 2>/dev/null | grep '^hw-version:') - [[ $hwlin =~ hw-version:[[:space:]]*\"([^\"]+) ]] + eeprom=$(mts-id-eeprom --in-file "$eepromPath" 2>/dev/null) + [[ $eeprom =~ [[:space:]]hw-version:[[:space:]]*\"([^\"]+) ]] hw=${BASH_REMATCH[1]} mach=${hw/%-*} rev=${hw/#*-/} echo mach is $mach echo rev is $rev - capd="${sysdir}/capability" + + regx='capa-(.*):[[:space:]]*true' + capflags=$(echo "$eeprom" | egrep "$regx" | sed -e 's/capa-//g' -e 's/: true//') + capflags=" ${capflags} " # add device tree overlays, if they exist. [[ -d /lib/dtoverlays ]] || return 1 @@ -83,15 +86,14 @@ setdevtree() { if [[ -d capability ]] ; then cd capability for d in * ; do - if [[ -f ${capd}/$d ]] ; then - if (($(cat ${capd}/$d) == 1)) ; then - echo "This device has capabilithy $d" - ( - cd $d - install_dtbo_dir - ) - fi # Install dtbo files for a capability - fi # Does a given capability flag exist in the mts-io platform + echo "We have found overlay capability directory $d" + if [[ ${capflags} =~ [[:space:]]${d}[[:space:]] ]] ; then + echo "This device has capabilithy $d so install the overlay" + ( + cd $d + install_dtbo_dir + ) + fi # Does a given capability flag exist in the EEPROM done # Loop over all capabilities for this machine and version overlays fi # Is there a capability directory to be installed? ) diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.2.bb b/recipes-bsp/multitech/mt-dt-overlay_1.1.2.bb index 09c8f4a..98fb5e4 100644 --- a/recipes-bsp/multitech/mt-dt-overlay_1.1.2.bb +++ b/recipes-bsp/multitech/mt-dt-overlay_1.1.2.bb @@ -24,7 +24,7 @@ COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" dt_dir = "/lib/dtoverlays" -PR = "r3" +PR = "r4" SRC_URI = " \ git://git.multitech.net/mt-dt-overlay.git;protocol=git \ |