summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/apalis-imx8.conf9
-rw-r--r--conf/machine/colibri-imx6ull-emmc.conf49
-rw-r--r--conf/machine/colibri-imx8x.conf7
-rw-r--r--conf/machine/include/colibri-imx6ull-emmc.inc28
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-common.inc2
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc2
-rw-r--r--recipes-graphics/wayland/weston-init.bbappend35
-rw-r--r--recipes-kernel/linux/device-tree-overlays_git.bb2
-rw-r--r--recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb3
-rw-r--r--recipes-support/bmode-usb/bmode-usb_1.0.bb1
10 files changed, 131 insertions, 7 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index 035c28f..3fc0c59 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -30,6 +30,10 @@ KERNEL_DEVICETREE = " \
freescale/imx8qm-apalis-ixora-v1.1.dtb \
freescale/imx8qm-apalis-v1.1-eval.dtb \
freescale/imx8qm-apalis-v1.1-ixora-v1.1.dtb \
+ freescale/imx8qm-apalis-v1.1-ixora-v1.2.dtb \
+ freescale/imx8qp-apalis-v1.1-eval.dtb \
+ freescale/imx8qp-apalis-v1.1-ixora-v1.1.dtb \
+ freescale/imx8qp-apalis-v1.1-ixora-v1.2.dtb \
"
KERNEL_IMAGETYPE_aarch64 = "Image.gz"
@@ -80,5 +84,6 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "apalis-imx8_hdmi_overlay.dtbo"
TORADEX_PRODUCT_IDS = "0037 0047 0048 0049"
TORADEX_PRODUCT_IDS[0037] = "imx8qm-apalis-v1.1-eval.dtb"
TORADEX_PRODUCT_IDS[0047] = "imx8qm-apalis-v1.1-eval.dtb"
-TORADEX_PRODUCT_IDS[0048] = "imx8qm-apalis-v1.1-eval.dtb"
-TORADEX_PRODUCT_IDS[0049] = "imx8qm-apalis-v1.1-eval.dtb"
+TORADEX_PRODUCT_IDS[0048] = "imx8qp-apalis-v1.1-eval.dtb"
+TORADEX_PRODUCT_IDS[0049] = "imx8qp-apalis-v1.1-eval.dtb"
+
diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf
new file mode 100644
index 0000000..46a9b13
--- /dev/null
+++ b/conf/machine/colibri-imx6ull-emmc.conf
@@ -0,0 +1,49 @@
+#@TYPE: Machine
+#@NAME: Toradex Colibri iMX6ULL 1GB (eMMC)
+#@SOC: i.MX6ULL
+#@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 ULL 1GB (eMMC) SOM
+#@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
+
+MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:"
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa7.inc
+
+PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ?= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
+
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
+
+KERNEL_DEVICETREE_use-mainline-bsp = " \
+ imx6ull-colibri-emmc-eval-v3.dtb \
+"
+KERNEL_DEVICETREE_use-nxp-bsp = " \
+ imx6ull-colibri-emmc-aster.dtb \
+ imx6ull-colibri-emmc-eval-v3.dtb \
+ imx6ull-colibri-emmc-iris.dtb \
+ imx6ull-colibri-emmc-iris-v2.dtb \
+"
+
+KERNEL_IMAGETYPE = "zImage"
+# The kernel lives in its own ubi volume.
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+
+PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
+PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
+PREFERRED_RPROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
+PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex"
+
+UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_MACHINE ?= "colibri-imx6ull-emmc_defconfig"
+
+IMAGE_FSTYPES += "tar.xz"
+# wic support
+IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS_append = " u-boot-default-script"
+WKS_FILE = "sdimage-bootpart.wks"
+
+MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
+MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index dec2f7a..102d805 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -26,9 +26,14 @@ LOADADDR = ""
USE_VT = "0"
KERNEL_DEVICETREE = " \
+ freescale/imx8dx-colibri-aster.dtb \
+ freescale/imx8dx-colibri-eval-v3.dtb \
+ freescale/imx8dx-colibri-iris.dtb \
+ freescale/imx8dx-colibri-iris-v2.dtb \
freescale/imx8qxp-colibri-aster.dtb \
- freescale/imx8qxp-colibri-dsihdmi-eval-v3.dtb \
freescale/imx8qxp-colibri-eval-v3.dtb \
+ freescale/imx8qxp-colibri-iris.dtb \
+ freescale/imx8qxp-colibri-iris-v2.dtb \
"
KERNEL_DEVICETREE_use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb"
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
new file mode 100644
index 0000000..278ba8c
--- /dev/null
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -0,0 +1,28 @@
+IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_FSTYPES_append = " teziimg"
+# The payload offsets are given in number of 512 byte blocks.
+OFFSET_BOOTROM_PAYLOAD = "2"
+TORADEX_PRODUCT_IDS = "0062"
+TORADEX_FLASH_TYPE = "emmc"
+
+WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
+
+MACHINE_NAME = "Colibri-iMX6ULL-eMMC"
+
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
+
+# MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
+
+UBOOT_MAKE_TARGET_colibri-imx6ull-emmc = "u-boot.imx"
+UBOOT_ENTRYPOINT_colibri-imx6ull-emmc = "0x81000000"
+UBOOT_DTB_LOADADDRESS_colibri-imx6ull-emmc = "0x82100000"
+UBOOT_DTBO_LOADADDRESS_colibri-imx6ull-emmc = "0x87000000"
+
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6ull_parallel-rgb_vga_overlay.dtbo colibri-imx6ull_ad7879_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx6ull_parallel-rgb_overlay.dtbo colibri-imx6ull_ad7879_overlay.dtbo display-vga_overlay.dtbo"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common.inc b/recipes-bsp/u-boot/u-boot-toradex-common.inc
index 96ccd55..673fb56 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common.inc
@@ -12,7 +12,7 @@ inherit toradex-u-boot-localversion
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "68f97c8d17f0d9822565b0a28a1d6705acef2355"
+SRCREV = "eb6c58cb014022d45a880c1eb9761e5d6ce623c0"
SRCBRANCH = "toradex_2020.07"
SRCREV_use-head-next = "${AUTOREV}"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
index 83245d8..b7a8048 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
@@ -10,7 +10,7 @@ SRC_URI = " \
file://fw_env.config \
"
-SRCREV = "7f3416a28c3442018d19d3d0a14b22363e3b3bd1"
+SRCREV = "6a8d4f758d0331ee303517618f8368ef52c9d1c7"
SRCREV_use-head-next = "${AUTOREV}"
SRCBRANCH = "toradex_imx_v2020.04_5.4.70_2.3.0"
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index c92a3c6..d2eba90 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -12,3 +12,38 @@ uncomment() {
sed -i -e 's,^#'"$1"','"$1"',g' $2
fi
}
+
+
+configure_noidle() {
+ sed -i '/idle-time=0/d' ${D}${sysconfdir}/xdg/weston/weston.ini
+ sed -i '/^\[core\]/a idle-time=0' ${D}${sysconfdir}/xdg/weston/weston.ini
+}
+
+# Prevent weston from going to sleep
+do_install_append_upstream() {
+ configure_noidle
+}
+
+configure_pixman() {
+ sed -i '/use-pixman=true/d' ${D}${sysconfdir}/xdg/weston/weston.ini
+ sed -i '/^\[core\]/a use-pixman=true' ${D}${sysconfdir}/xdg/weston/weston.ini
+}
+
+# With upstream weston and modules without GPU weston uses a lot of
+# cpu time and becomes very unresponsive. Setting use-pixman=true works
+# around it.
+do_install_append_upstream_colibri-imx6ull() {
+ configure_pixman
+}
+
+do_install_append_upstream_colibri-imx6ull-emmc() {
+ configure_pixman
+}
+
+do_install_append_upstream_colibri-imx7() {
+ configure_pixman
+}
+
+do_install_append_upstream_colibri-imx7-emmc() {
+ configure_pixman
+}
diff --git a/recipes-kernel/linux/device-tree-overlays_git.bb b/recipes-kernel/linux/device-tree-overlays_git.bb
index 6c0b921..db103cb 100644
--- a/recipes-kernel/linux/device-tree-overlays_git.bb
+++ b/recipes-kernel/linux/device-tree-overlays_git.bb
@@ -1,7 +1,7 @@
inherit toradex-devicetree
SRCBRANCH = "toradex_5.4-2.3.x-imx"
-SRCREV = "90d5687035aa8f7894da431c959c920f5cb9ae1f"
+SRCREV = "a52d315e89af02a63ed5d43d77626a91e3e82da5"
SRCREV_use-head-next = "${AUTOREV}"
# we have dtbo's in arm and arm64 architecture, set the include paths
diff --git a/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
index b9f3363..fbdc797 100644
--- a/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
+++ b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
@@ -22,7 +22,7 @@ KERNEL_VERSION_SANITY_SKIP_use-head-next = "1"
LOCALVERSION = "-${TDX_VERSION}"
SRCBRANCH = "toradex_5.4-2.3.x-imx"
-SRCREV_machine = "a9729c9288e7f599d96b298d24fe038eb44bd4eb"
+SRCREV_machine = "022cb949c6ec0df629b50552af88e5045c83cfdb"
SRCREV_machine_use-head-next = "${AUTOREV}"
DEPENDS += "lzop-native bc-native"
@@ -31,6 +31,7 @@ COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
KBUILD_DEFCONFIG_apalis-imx6 ?= "apalis_imx6_defconfig"
KBUILD_DEFCONFIG_colibri-imx6 ?= "colibri_imx6_defconfig"
KBUILD_DEFCONFIG_colibri-imx6ull ?= "colibri-imx6ull_defconfig"
+KBUILD_DEFCONFIG_colibri-imx6ull-emmc ?= "colibri-imx6ull_defconfig"
KBUILD_DEFCONFIG_mx7 ?= "colibri_imx7_defconfig"
KBUILD_DEFCONFIG_mx8 ?= "toradex_defconfig"
diff --git a/recipes-support/bmode-usb/bmode-usb_1.0.bb b/recipes-support/bmode-usb/bmode-usb_1.0.bb
index 752c09b..62d48b4 100644
--- a/recipes-support/bmode-usb/bmode-usb_1.0.bb
+++ b/recipes-support/bmode-usb/bmode-usb_1.0.bb
@@ -8,6 +8,7 @@ DEFINE = "NO_MACHINE"
DEFINE_apalis-imx6 = "MX6"
DEFINE_colibri-imx6 = "MX6"
DEFINE_colibri-imx6ull = "MX6ULL"
+DEFINE_colibri-imx6ull-emmc = "MX6ULL"
do_compile() {
${CC} -o bmode_usb bmode_usb.c ${CFLAGS} ${LDFLAGS} -D ${DEFINE}