From 0ec6cb490fdffa6144db9a08c2f585aa065fb2de Mon Sep 17 00:00:00 2001
From: Philippe Schenker <philippe.schenker@toradex.com>
Date: Wed, 25 Sep 2019 17:03:27 +0200
Subject: Add initial support for Apalis-iMX8X

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
 conf/machine/apalis-imx8x.conf                     | 72 ++++++++++++++++++++++
 .../imx-sc-firmware/imx-sc-firmware_%.bbappend     |  1 +
 .../u-boot/u-boot-toradex-fw-utils_2019.07.bb      |  4 ++
 3 files changed, 77 insertions(+)
 create mode 100644 conf/machine/apalis-imx8x.conf

diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf
new file mode 100644
index 0000000..a3e585f
--- /dev/null
+++ b/conf/machine/apalis-imx8x.conf
@@ -0,0 +1,72 @@
+#@TYPE: Machine
+#@NAME: Apalis iMX8X
+#@DESCRIPTION: Apalis iMX8X powered by a i.MX 8X SoC
+#@MAINTAINER: Philippe Schenker <philippe.schenker@toradex.com>
+
+MACHINE_NAME = "Apalis-iMX8X"
+
+MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+# Don't include kernels in standard images
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+
+LOADADDR = ""
+
+# we do not want to have getty running on tty1 as we run
+# auto-serial-console there
+USE_VT = "0"
+
+KERNEL_DEVICETREE = " \
+    freescale/fsl-imx8qxp-apalis-eval.dtb \
+"
+
+UBOOT_MAKE_TARGET = "u-boot.bin"
+UBOOT_SUFFIX = "bin"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "apalis-imx8qxp_config,sdcard"
+
+BOOT_SPACE = "65536"
+IMAGE_BOOTLOADER = "imx-boot"
+IMX_BOOT_SEEK = "32"
+
+MACHINE_BOOT_FILES = "boot.scr"
+IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
+WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
+PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
+# Currently we use the nxp 2018.03 downstream for mx8 as some features are
+# not yet available in 2019.03.
+PREFERRED_VERSION_u-boot-toradex = "2018.03"
+PREFERRED_VERSION_u-boot-toradex-fw-utils = "2018.03"
+
+MACHINE_FIRMWARE_append = " linux-firmware-pcie8997"
+MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8"
+
+IMXBOOT_TARGETS = "flash"
+
+PREFERRED_PROVIDER_virtual/libg2d_imxdpu = "imx-dpu-g2d"
+PREFERRED_VERSION_wayland-protocols_mx8 = "1.16.imx"
+PREFERRED_VERSION_weston_mx8 = "5.0.0.imx"
+
+BOARD_TYPE = "apalis"
+
+IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_FSTYPES += "teziimg"
+
+# The imx-boot container takes care for the i.MX 8 offset, so the container
+# has to be flashed at offset 0 directly
+UBOOT_BINARY_TEZI_EMMC="imx-boot"
+OFFSET_BOOTROM_PAYLOAD="0"
+do_image_teziimg[depends] += "imx-boot:do_deploy"
+do_image_teziimg_distro[depends] += "imx-boot:do_deploy"
+
+TORADEX_PRODUCT_IDS = "0046 0053 0054 2600"
+TORADEX_PRODUCT_IDS[0046] = "fsl-imx8qxp-apalis-eval.dtb"
+TORADEX_PRODUCT_IDS[0053] = "fsl-imx8qxp-apalis-eval.dtb"
+TORADEX_PRODUCT_IDS[0054] = "fsl-imx8qxp-apalis-eval.dtb"
+TORADEX_PRODUCT_IDS[2600] = "fsl-imx8qxp-apalis-eval.dtb"
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_%.bbappend b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_%.bbappend
index 42b1499..b22006b 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_%.bbappend
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_%.bbappend
@@ -3,6 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/imx-sc-firmware:"
 SRC_URI += " \
      file://mx8qm-apalis-scfw-tcm.bin \
      file://mx8qx-colibri-scfw-tcm.bin \
+     file://mx8qx-apalis-scfw-tcm.bin \
 "
 
 do_patch[prefuncs] += "do_cp_scfw"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2019.07.bb
index 3f036c1..a1e1290 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2019.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_2019.07.bb
@@ -53,6 +53,10 @@ do_install_append_apalis-imx8() {
     install_unlock_emmc
 }
 
+do_install_append_apalis-imx8x() {
+    install_unlock_emmc
+}
+
 do_install_append_colibri-imx8x() {
     install_unlock_emmc
 }
-- 
cgit v1.2.3