summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes-core/udev/files/aquila-am69/10-toradex-can0-ifname.link6
-rw-r--r--recipes-core/udev/files/aquila-am69/10-toradex-can1-ifname.link6
-rw-r--r--recipes-core/udev/files/aquila-am69/10-toradex-can10-ifname.link6
-rw-r--r--recipes-core/udev/files/aquila-am69/10-toradex-can13-ifname.link6
-rw-r--r--recipes-core/udev/files/aquila-am69/99-toradex.rules21
-rw-r--r--recipes-graphics/wayland/weston-init.bbappend2
-rw-r--r--recipes-kernel/linux-firmware/linux-firmware_%.bbappend6
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline_git.bb4
8 files changed, 51 insertions, 6 deletions
diff --git a/recipes-core/udev/files/aquila-am69/10-toradex-can0-ifname.link b/recipes-core/udev/files/aquila-am69/10-toradex-can0-ifname.link
new file mode 100644
index 0000000..7058581
--- /dev/null
+++ b/recipes-core/udev/files/aquila-am69/10-toradex-can0-ifname.link
@@ -0,0 +1,6 @@
+[Match]
+Property=ID_PATH=platform-40528000.can
+
+[Link]
+AlternativeNamesPolicy=
+AlternativeName=aquila-can2
diff --git a/recipes-core/udev/files/aquila-am69/10-toradex-can1-ifname.link b/recipes-core/udev/files/aquila-am69/10-toradex-can1-ifname.link
new file mode 100644
index 0000000..284ba25
--- /dev/null
+++ b/recipes-core/udev/files/aquila-am69/10-toradex-can1-ifname.link
@@ -0,0 +1,6 @@
+[Match]
+Property=ID_PATH=platform-40568000.can
+
+[Link]
+AlternativeNamesPolicy=
+AlternativeName=aquila-can4
diff --git a/recipes-core/udev/files/aquila-am69/10-toradex-can10-ifname.link b/recipes-core/udev/files/aquila-am69/10-toradex-can10-ifname.link
new file mode 100644
index 0000000..03d124f
--- /dev/null
+++ b/recipes-core/udev/files/aquila-am69/10-toradex-can10-ifname.link
@@ -0,0 +1,6 @@
+[Match]
+Property=ID_PATH=platform-27a1000.can
+
+[Link]
+AlternativeNamesPolicy=
+AlternativeName=aquila-can1
diff --git a/recipes-core/udev/files/aquila-am69/10-toradex-can13-ifname.link b/recipes-core/udev/files/aquila-am69/10-toradex-can13-ifname.link
new file mode 100644
index 0000000..12502d7
--- /dev/null
+++ b/recipes-core/udev/files/aquila-am69/10-toradex-can13-ifname.link
@@ -0,0 +1,6 @@
+[Match]
+Property=ID_PATH=platform-27d1000.can
+
+[Link]
+AlternativeNamesPolicy=
+AlternativeName=aquila-can3
diff --git a/recipes-core/udev/files/aquila-am69/99-toradex.rules b/recipes-core/udev/files/aquila-am69/99-toradex.rules
new file mode 100644
index 0000000..a40a5a2
--- /dev/null
+++ b/recipes-core/udev/files/aquila-am69/99-toradex.rules
@@ -0,0 +1,21 @@
+ACTION=="add|change", KERNEL=="i2c-[0-9]*", KERNELS=="40b00000.i2c", SYMLINK+="aquila-i2c1"
+ACTION=="add|change", KERNEL=="i2c-[0-9]*", KERNELS=="40b10000.i2c", SYMLINK+="aquila-i2c2"
+ACTION=="add|change", KERNEL=="i2c-[0-9]*", KERNELS=="2000000.i2c", SYMLINK+="aquila-i2c3"
+ACTION=="add|change", KERNEL=="i2c-[0-9]*", KERNELS=="2010000.i2c", SYMLINK+="aquila-i2c4"
+ACTION=="add|change", KERNEL=="i2c-[0-9]*", KERNELS=="2020000.i2c", SYMLINK+="aquila-i2c5"
+ACTION=="add|change", KERNEL=="i2c-[0-9]*", KERNELS=="2050000.i2c", SYMLINK+="aquila-i2c6"
+ACTION=="add|change", KERNEL=="i2c-[0-9]*", KERNELS=="42120000.i2c", SYMLINK+="aquila-i2c-on-module"
+ACTION=="add|change", KERNEL=="ttyS[0-9]*", KERNELS=="2810000.serial", SYMLINK+="aquila-uart1"
+ACTION=="add|change", KERNEL=="ttyS[0-9]*", KERNELS=="42300000.serial", SYMLINK+="aquila-uart2"
+ACTION=="add|change", KERNEL=="ttyS[0-9]*", KERNELS=="2880000.serial", SYMLINK+="aquila-uart3"
+ACTION=="add|change", KERNEL=="ttyS[0-9]*", KERNELS=="2800000.serial", SYMLINK+="aquila-uart4"
+ACTION=="add|change", KERNELS=="watchdog", SYMLINK+="aquila-watchdog", SYMLINK+="aquila-watchdog-soc"
+ACTION=="add|change", SUBSYSTEM=="spidev", KERNELS=="2120000.*spi", SYMLINK+="aquila-spi1-cs%n"
+ACTION=="add|change", SUBSYSTEM=="spidev", KERNELS=="2100000.*spi", SYMLINK+="aquila-spi2-cs%n"
+KERNEL=="mmcblk[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="4f80000.mmc", SYMLINK+="emmc"
+KERNEL=="mmcblk[0-9]boot[0-9]", ENV{DEVTYPE}=="disk", KERNELS=="4f80000.mmc", SYMLINK+="emmc-boot%n"
+KERNEL=="mmcblk[0-9]p[0-9]", ENV{DEVTYPE}=="partition", KERNELS=="4f80000.mmc", SYMLINK+="emmc-part%n"
+#TODO ADC
+#SUBSYSTEM=="iio", KERNELS=="iio:device0", RUN+="/etc/udev/scripts/toradex-adc.sh"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]", KERNELS=="4fb0000.mmc", SYMLINK+="aquila-sd"
+ACTION=="add|change", KERNEL=="mmcblk[0-9]p[0-9]*", KERNELS=="4fb0000.mmc", SYMLINK+="aquila-sd-part%n"
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 6baccf4..bbccdd9 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://weston.sh"
PACKAGECONFIG:append:upstream:tdx = " no-idle-timeout"
-PACKAGECONFIG:append:am62x = " no-idle-timeout"
+PACKAGECONFIG:append:k3 = " no-idle-timeout"
PACKAGECONFIG:append:upstream:colibri-imx6ull = " use-pixman"
PACKAGECONFIG:append:upstream:colibri-imx6ull-emmc = " use-pixman"
PACKAGECONFIG:append:upstream:colibri-imx7 = " use-pixman"
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 68251c2..6bfd97e 100644
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -1,10 +1,10 @@
IMX_FIRMWARE_SRC ?= "git://github.com/NXP/imx-firmware.git;protocol=https"
-SRCBRANCH_imx-firmware = "lf-6.1.55_2.2.0"
+SRCBRANCH_imx-firmware = "lf-6.6.3_1.0.0"
SRC_URI += " \
${IMX_FIRMWARE_SRC};branch=${SRCBRANCH_imx-firmware};destsuffix=${S}/imx-firmware;name=imx-firmware \
"
-SRCREV_imx-firmware = "7be5a936ce8677962dd7b41c6c9f41dd14350bec"
+SRCREV_imx-firmware = "2afa15e77f0b58eade42b4f59c9215339efcca66"
SRCREV_FORMAT = "default_imx-firmware"
@@ -35,7 +35,7 @@ LICENSE += " \
& firmware-imx \
"
LIC_FILES_CHKSUM += " \
- file://imx-firmware/LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7 \
+ file://imx-firmware/LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f \
"
NO_GENERIC_LICENSE[firmware-imx] = "imx-firmware/LICENSE.txt"
diff --git a/recipes-kernel/linux/linux-toradex-mainline_git.bb b/recipes-kernel/linux/linux-toradex-mainline_git.bb
index 5ea1158..a58cc27 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_git.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_git.bb
@@ -55,10 +55,10 @@ SRC_URI:append = " \
file://0002-arm-dts-nxp-imx-Add-support-for-Apalis-Evaluation-Bo.patch \
"
-LINUX_VERSION ?= "6.1.84"
+LINUX_VERSION ?= "6.1.89"
KBRANCH = "linux-6.1.y"
KERNEL_VERSION_SANITY_SKIP = "1"
-SRCREV_machine = "347385861c50adc8d4801d4b899eded38a2f04cd"
+SRCREV_machine = "dcbc050cb0d304c3427d6583384eebcaf0e3caee"
SRCREV_machine:use-head-next = "${AUTOREV}"
S = "${WORKDIR}/git"