summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Nie <jun.nie@linaro.org>2021-03-05 16:28:50 +0800
committerJun Nie <jun.nie@linaro.org>2021-03-05 16:36:20 +0800
commit7708404b5f4e92a3ba9964d60788c42ba05f7622 (patch)
treebb22face294ada8c76f0f74d6d2ecdb9b90ec64c
parentb70cd394819915752d3ce7c066dafff75d9126cd (diff)
bsp: Add initial imx8mp evk stuff
Add initial imx8mp evk stuff from copying imx8mm evk. Not pass build yet. Signed-off-by: Jun Nie <jun.nie@linaro.org>
-rw-r--r--meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc32
-rw-r--r--meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc9
-rw-r--r--meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree.bbappend4
-rw-r--r--meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree/freescale_fsl-imx8mp-evk.dts1
-rw-r--r--meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bbappend4
-rw-r--r--meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.10.0.bbappend5
-rw-r--r--meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.6.0.bbappend4
7 files changed, 59 insertions, 0 deletions
diff --git a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
index 636a317..cab61df 100644
--- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
+++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
@@ -329,6 +329,38 @@ SOTA_CLIENT_FEATURES_append_imx8mmevk = " ubootenv"
MACHINE_FEATURES_remove_imx8mmevk = "qca9377 qca6174"
UBOOT_MACHINE_imx8mmevk = "imx8mm_evk_config"
+# iMX8MP
+UBOOT_SIGN_ENABLE_sota_mx8mp = "1"
+PREFERRED_PROVIDER_virtual/bootloader_mx8mp ?= "u-boot-fio"
+PREFERRED_PROVIDER_u-boot_mx8mp ?= "u-boot-fio"
+PREFERRED_PROVIDER_u-boot-fw-utils_mx8mp = "libubootenv"
+PREFERRED_RPROVIDER_u-boot-fw-utils_mx8mp = "libubootenv"
+UBOOT_DTB_LOADADDRESS_mx8mp = "0x43000000"
+PREFERRED_PROVIDER_virtual/trusted-firmware-a_mx8mp ?= "imx-atf"
+EXTRA_IMAGEDEPENDS_append_mx8mp = "virtual/trusted-firmware-a"
+UBOOT_CLASSES_mx8mp = "uboot-fitimage"
+ATF_BINARY_mx8mp = "arm-trusted-firmware.bin"
+UBOOT_CONFIG_mx8mp = ""
+UBOOT_SUFFIX_mx8mp = "bin"
+IMAGE_BOOT_FILES_mx8mp = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
+IMAGE_BOOT_FILES_sota_mx8mp = "imx-boot u-boot.itb boot.itb"
+WKS_FILE_DEPENDS_append_mx8mp = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script_mx8mp = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script_sota_mx8mp = "u-boot-ostree-scr-fit"
+KERNEL_IMAGETYPE_sota_mx8mp = "fitImage"
+KERNEL_CLASSES_sota_mx8mp = " kernel-lmp-fitimage "
+## iMX8: Use latest NXP BSP downstream kernel
+PREFERRED_PROVIDER_virtual/kernel_mx8mp ?= "linux-lmp-fslc-imx"
+MACHINE_FIRMWARE_mx8mp = "linux-firmware-imx-sdma-imx7d"
+WKS_FILE_sota_mx8mp = "sdimage-imx8-spl-sota.wks.in"
+IMXBOOT_TARGETS_mx8mp = "flash_evk_spl"
+## iMX8MP EVK
+OSTREE_KERNEL_ARGS_imx8mpevk ?= "console=tty1 console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200 root=/dev/mmcblk2p2 rootfstype=ext4"
+PREFERRED_PROVIDER_virtual/dtb_imx8mpevk ?= "lmp-device-tree"
+SOTA_CLIENT_FEATURES_append_imx8mpevk = " ubootenv"
+MACHINE_FEATURES_remove_imx8mpevk = "qca9377 qca6174"
+UBOOT_MACHINE_imx8mpevk = "imx8mm_evk_config"
+
# STM32MP1
PREFERRED_PROVIDER_virtual/kernel_stm32mp1common ?= "linux-lmp-stm32"
KERNEL_IMAGETYPE_stm32mp1common = "fitImage"
diff --git a/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc
index 319e9bb..585553f 100644
--- a/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc
+++ b/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc
@@ -53,6 +53,15 @@ IMAGE_BOOT_FILES_mx8mm = "imx-boot u-boot.itb boot.itb"
KERNEL_IMAGETYPE_mx8mm = "fitImage"
KERNEL_CLASSES_mx8mm = " kernel-lmp-fitimage "
+# iMX8MP
+UBOOT_SIGN_ENABLE_mx8mp = "1"
+PREFERRED_PROVIDER_virtual/bootloader_mx8mp = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot_mx8mp = "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script_mx8mp = "u-boot-ostree-scr"
+IMAGE_BOOT_FILES_mx8mp = "imx-boot u-boot.itb boot.itb"
+KERNEL_IMAGETYPE_mx8mp = "fitImage"
+KERNEL_CLASSES_mx8mp = " kernel-lmp-fitimage "
+
# Apalis-iMX6
UBOOT_SIGN_ENABLE_apalis-imx6 = "1"
PREFERRED_PROVIDER_virtual/kernel_apalis-imx6 = "linux-lmp-dev-mfgtool"
diff --git a/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree.bbappend b/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree.bbappend
index 7908be8..95cca16 100644
--- a/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree.bbappend
+++ b/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree.bbappend
@@ -13,3 +13,7 @@ SRC_URI_append_imx8mmevk = " \
file://freescale_fsl-imx8mm-evk.dts \
"
COMPATIBLE_MACHINE_imx8mmevk = ".*"
+SRC_URI_append_imx8mpevk = " \
+ file://freescale_fsl-imx8mp-evk.dts \
+"
+COMPATIBLE_MACHINE_imx8mpevk = ".*"
diff --git a/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree/freescale_fsl-imx8mp-evk.dts b/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree/freescale_fsl-imx8mp-evk.dts
new file mode 100644
index 0000000..7e3f954
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree/freescale_fsl-imx8mp-evk.dts
@@ -0,0 +1 @@
+#include "imx8mp-evk.dts"
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bbappend b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bbappend
index 2d59d43..abceef4 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bbappend
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.6.0.bbappend
@@ -1,6 +1,7 @@
OPTEEMACHINE_imx7ulpea-ucom = "imx-mx7ulpeaucom"
OPTEEMACHINE_apalis-imx6 = "imx-mx6qapalis"
OPTEEMACHINE_imx8mmevk = "imx-imx8mmevk"
+OPTEEMACHINE_imx8mpevk = "imx-imx8mpevk"
OPTEEMACHINE_imx6ullevk = "imx-mx6ullevk"
EXTRA_OEMAKE_append_apalis-imx6 = " \
@@ -16,6 +17,9 @@ EXTRA_OEMAKE_append_imx7ulpea-ucom = " \
EXTRA_OEMAKE_append_imx8mmevk = " \
CFG_DT=y CFG_OVERLAY_ADDR=0x43600000 \
"
+EXTRA_OEMAKE_append_imx8mpevk = " \
+ CFG_DT=y CFG_OVERLAY_ADDR=0x43600000 \
+"
EXTRA_OEMAKE_append_imx6ullevk = " \
CFG_NS_ENTRY_ADDR=0x87800000 CFG_IMX_WDOG_EXT_RESET=y \
CFG_TZDRAM_START=0x9e000000 CFG_OVERLAY_ADDR=0x86000000 \
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.10.0.bbappend b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.10.0.bbappend
index 5358273..a458404 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.10.0.bbappend
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.10.0.bbappend
@@ -3,6 +3,7 @@ OPTEEMACHINE_qemuarm64 = "vexpress-qemu_armv8a"
OPTEEMACHINE_imx6ullevk = "imx-mx6ullevk"
OPTEEMACHINE_imx8mqevk = "imx-mx8mqevk"
OPTEEMACHINE_imx8mmevk = "imx-mx8mmevk"
+OPTEEMACHINE_imx8mpevk = "imx-mx8mpevk"
OPTEEMACHINE_uz = "zynqmp-zcu102"
EXTRA_OEMAKE_append_imx = " \
@@ -28,6 +29,10 @@ EXTRA_OEMAKE_append_imx8mmevk = " \
CFG_NXP_CAAM=y CFG_RNG_PTA=y \
CFG_CORE_DYN_SHM=n CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x43200000 \
"
+EXTRA_OEMAKE_append_imx8mpevk = " \
+ CFG_NXP_CAAM=y CFG_RNG_PTA=y \
+ CFG_CORE_DYN_SHM=n CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x43200000 \
+"
EXTRA_OEMAKE_append_uz = " \
CFG_TZDRAM_START=0x7e000000 CFG_TZDRAM_SIZE=0x1c00000 \
CFG_SHMEM_START=0x7fc00000 CFG_SHMEM_SIZE=0x400000 \
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.6.0.bbappend b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.6.0.bbappend
index 05d7a9e..40ece7d 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.6.0.bbappend
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_3.6.0.bbappend
@@ -3,6 +3,7 @@ OPTEEMACHINE_apalis-imx6 = "imx-mx6qapalis"
OPTEEMACHINE_cubox-i = "imx-mx6dhmbedge"
OPTEEMACHINE_qemuarm64 = "vexpress-qemu_armv8a"
OPTEEMACHINE_imx8mmevk = "imx-imx8mmevk"
+OPTEEMACHINE_imx8mpevk = "imx-imx8mpevk"
OPTEEMACHINE_imx6ullevk = "imx-mx6ullevk"
EXTRA_OEMAKE_append_imx = " \
@@ -26,6 +27,9 @@ EXTRA_OEMAKE_append_imx7ulpea-ucom = " \
EXTRA_OEMAKE_append_imx8mmevk = " \
CFG_CORE_DYN_SHM=n CFG_DT=y CFG_OVERLAY_ADDR=0x43600000 \
"
+EXTRA_OEMAKE_append_imx8mpevk = " \
+ CFG_CORE_DYN_SHM=n CFG_DT=y CFG_OVERLAY_ADDR=0x43600000 \
+"
EXTRA_OEMAKE_append_imx6ullevk = " \
CFG_NS_ENTRY_ADDR=0x87800000 CFG_IMX_WDOG_EXT_RESET=y \
CFG_TZDRAM_START=0x9e000000 CFG_OVERLAY_ADDR=0x86000000 \