From b23d688acc9038919c3b367f2c1e7b945ccf9b6a Mon Sep 17 00:00:00 2001 From: Volodymyr Vorobiov Date: Tue, 20 Sep 2022 14:32:53 +0300 Subject: [MTX-4620] MTCDT3 R.6.2.0: support in mts-id-eeprom for MTCDT3AC GP-1742 Change flag sub-board to daughter-board and some fix --- recipes-bsp/multitech/mts-id-eeprom_0.6.5.bb | 3 --- recipes-bsp/multitech/mts-id-eeprom_0.6.6.bb | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 recipes-bsp/multitech/mts-id-eeprom_0.6.5.bb create mode 100644 recipes-bsp/multitech/mts-id-eeprom_0.6.6.bb diff --git a/recipes-bsp/multitech/mts-id-eeprom_0.6.5.bb b/recipes-bsp/multitech/mts-id-eeprom_0.6.5.bb deleted file mode 100644 index ccf3521..0000000 --- a/recipes-bsp/multitech/mts-id-eeprom_0.6.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require mts-id-eeprom.inc - -PR = "${INC_PR}.0" diff --git a/recipes-bsp/multitech/mts-id-eeprom_0.6.6.bb b/recipes-bsp/multitech/mts-id-eeprom_0.6.6.bb new file mode 100644 index 0000000..ccf3521 --- /dev/null +++ b/recipes-bsp/multitech/mts-id-eeprom_0.6.6.bb @@ -0,0 +1,3 @@ +require mts-id-eeprom.inc + +PR = "${INC_PR}.0" -- cgit v1.2.3 From 985127953cec41b5d08eebc02a8ee3d79d8d6637 Mon Sep 17 00:00:00 2001 From: Vyacheslav Pedash Date: Wed, 21 Sep 2022 16:45:12 +0300 Subject: MTX-4638 Rename MTCDT3 to MTCDT3AC --- .../multitech/mt-dt-overlay/init-mtcpmhs-sdmfg | 12 +-- recipes-bsp/multitech/mt-dt-overlay_1.2.10.bb | 105 +++++++++++++++++++++ recipes-bsp/multitech/mt-dt-overlay_1.2.9.bb | 105 --------------------- 3 files changed, 111 insertions(+), 111 deletions(-) create mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.2.10.bb delete mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.2.9.bb diff --git a/recipes-bsp/multitech/mt-dt-overlay/init-mtcpmhs-sdmfg b/recipes-bsp/multitech/mt-dt-overlay/init-mtcpmhs-sdmfg index 2a0e03d..5edb36f 100644 --- a/recipes-bsp/multitech/mt-dt-overlay/init-mtcpmhs-sdmfg +++ b/recipes-bsp/multitech/mt-dt-overlay/init-mtcpmhs-sdmfg @@ -26,12 +26,12 @@ load_overlay() { # Detect PCA9557 I2C GPIO at 0x19 on I2C bus 1 RES_="$(/usr/sbin/i2cdetect -r -y 1 0x19 0x19)" if [[ "$RES_" =~ .*(^10:[[:blank:]]+19).* ]]; then - if ! pushd MTCDT3/0.2 ; then - echo "Can't find MTCDT3/0.2 direcotry" + if ! pushd MTCDT3AC/0.1 ; then + echo "Can't find MTCDT3AC/0.1 direcotry" popd return 1 fi - echo "Loading device tree overlay for MTCDT3 v 0.2" + echo "Loading device tree overlay for MTCDT3AC v 0.1" install_all_dtbo popd fi @@ -39,12 +39,12 @@ load_overlay() { # Detect MCP23008 I2C GPIO at 0x21 on I2C bus 1 RES_="$(/usr/sbin/i2cdetect -r -y 1 0x21 0x21)" if [[ "$RES_" =~ .*(^20:[[:blank:]]+21).* ]]; then - if ! pushd MTCDT3/0.0 ; then - echo "Can't find MTCDT3/0.0 direcotry" + if ! pushd MTCDT3AC/0.0 ; then + echo "Can't find MTCDT3AC/0.0 direcotry" popd return 1 fi - echo "Loading device tree overlay for MTCDT3 v 0.0" + echo "Loading device tree overlay for MTCDT3AC v 0.0" install_all_dtbo popd fi diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.2.10.bb b/recipes-bsp/multitech/mt-dt-overlay_1.2.10.bb new file mode 100644 index 0000000..356357d --- /dev/null +++ b/recipes-bsp/multitech/mt-dt-overlay_1.2.10.bb @@ -0,0 +1,105 @@ +DESCRIPTION = "Compile MT board device tree overlays" +LICENSE = "(GPLv2+)" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit update-rc.d +INITSCRIPT_NAME = "${PN}" +# mt-dt-overlay must start before mts-io +# because the gpio-leds driver will not load +# after mts-io. +INITSCRIPT_PARAMS = "start 39 S ." +DEPENDS = "dtc-native virtual/kernel u-boot-mkimage-native" +RDEPENDS_${PN} = "bash" + + +COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt|mtcpmhs)" + +# By using an overlay, we should be able to support multiple pinouts +# using the same image. The overlays go into /lib/dtoverlays. +# There names are: [hw-version]-driver.dtbo +# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo +# The idea is that mts-io will search for the overlays, and install the +# appropriate device tree overlay for the current hw-version. + +dt_dir = "/lib/dtoverlays" + +PR = "r2" + +SRC_URI = " \ + git://git.multitech.net/cgit/mt-dt-overlay.git;protocol=https \ + file://init-default \ + file://init-mtcpmhs \ + file://init-mtcpmhs-sdmfg \ +" + +SRCREV = "${PV}" + + +S = "${WORKDIR}/git" + +do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" +do_compile[nostamp] = "1" + +# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin +DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" + +do_compile () { + echo MACHINE is ${MACHINE} + oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos +} + +FILES_${PN} = "${dt_dir} ${sysconfdir}" + +addtask install after do_compile + +# The destination and any symlinks are defined in the source file. +# +# A line starting as follows " * Put: [destination]" in the source +# defines the destination file name for the device tree binaries. +# +# A line starting as follows " * Link: [destination]" defines a symlink +# to the device tree binary file. +# +do_install () { + install -d ${D}/${sysconfdir}/init.d + if [ ${MACHINE} = "mtcpmhs" ] ; then + if [ "${SDMFG}" = "" ]; then + install -m 0755 ${WORKDIR}/init-mtcpmhs ${D}/${sysconfdir}/init.d/${PN} + else + install -m 0755 ${WORKDIR}/init-mtcpmhs-sdmfg ${D}/${sysconfdir}/init.d/${PN} + fi + else + install -m 0755 ${WORKDIR}/init-default ${D}/${sysconfdir}/init.d/${PN} + fi + # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) + if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then + install -d ${D}/${dt_dir} + ( + cd ${MACHINE} + echo "Current directory is $(pwd)" + for f in *.dtbo ; do + s=$(basename -s .dtbo $f).dtso + location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') + echo "Binary: $f Source: $s" + echo "Destination: $location_ln" + dirname=$(dirname $location_ln) + install -d ${D}/${dt_dir}/$dirname + install ${f} ${D}/${dt_dir}/$location_ln + links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') + echo "All Links: " + echo "$links" + echo "End links" + for l in $links ; do + ldirname=$(dirname $l) + if ! [ -d "${D}/$ldirname" ] ; then + install -d ${D}/${dt_dir}/$ldirname + fi + echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l + ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l + done + done + ) + fi +} + diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.2.9.bb b/recipes-bsp/multitech/mt-dt-overlay_1.2.9.bb deleted file mode 100644 index 356357d..0000000 --- a/recipes-bsp/multitech/mt-dt-overlay_1.2.9.bb +++ /dev/null @@ -1,105 +0,0 @@ -DESCRIPTION = "Compile MT board device tree overlays" -LICENSE = "(GPLv2+)" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit update-rc.d -INITSCRIPT_NAME = "${PN}" -# mt-dt-overlay must start before mts-io -# because the gpio-leds driver will not load -# after mts-io. -INITSCRIPT_PARAMS = "start 39 S ." -DEPENDS = "dtc-native virtual/kernel u-boot-mkimage-native" -RDEPENDS_${PN} = "bash" - - -COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt|mtcpmhs)" - -# By using an overlay, we should be able to support multiple pinouts -# using the same image. The overlays go into /lib/dtoverlays. -# There names are: [hw-version]-driver.dtbo -# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo -# The idea is that mts-io will search for the overlays, and install the -# appropriate device tree overlay for the current hw-version. - -dt_dir = "/lib/dtoverlays" - -PR = "r2" - -SRC_URI = " \ - git://git.multitech.net/cgit/mt-dt-overlay.git;protocol=https \ - file://init-default \ - file://init-mtcpmhs \ - file://init-mtcpmhs-sdmfg \ -" - -SRCREV = "${PV}" - - -S = "${WORKDIR}/git" - -do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" -do_compile[nostamp] = "1" - -# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin -DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" - -do_compile () { - echo MACHINE is ${MACHINE} - oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos -} - -FILES_${PN} = "${dt_dir} ${sysconfdir}" - -addtask install after do_compile - -# The destination and any symlinks are defined in the source file. -# -# A line starting as follows " * Put: [destination]" in the source -# defines the destination file name for the device tree binaries. -# -# A line starting as follows " * Link: [destination]" defines a symlink -# to the device tree binary file. -# -do_install () { - install -d ${D}/${sysconfdir}/init.d - if [ ${MACHINE} = "mtcpmhs" ] ; then - if [ "${SDMFG}" = "" ]; then - install -m 0755 ${WORKDIR}/init-mtcpmhs ${D}/${sysconfdir}/init.d/${PN} - else - install -m 0755 ${WORKDIR}/init-mtcpmhs-sdmfg ${D}/${sysconfdir}/init.d/${PN} - fi - else - install -m 0755 ${WORKDIR}/init-default ${D}/${sysconfdir}/init.d/${PN} - fi - # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) - if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then - install -d ${D}/${dt_dir} - ( - cd ${MACHINE} - echo "Current directory is $(pwd)" - for f in *.dtbo ; do - s=$(basename -s .dtbo $f).dtso - location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') - echo "Binary: $f Source: $s" - echo "Destination: $location_ln" - dirname=$(dirname $location_ln) - install -d ${D}/${dt_dir}/$dirname - install ${f} ${D}/${dt_dir}/$location_ln - links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') - echo "All Links: " - echo "$links" - echo "End links" - for l in $links ; do - ldirname=$(dirname $l) - if ! [ -d "${D}/$ldirname" ] ; then - install -d ${D}/${dt_dir}/$ldirname - fi - echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l - ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l - done - done - ) - fi -} - -- cgit v1.2.3