From 915a779aa02e7d71525fb8f6c0c7009bd6787c24 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sat, 12 Dec 2020 16:30:27 -0600 Subject: [PATCH] imx8mp-evk: Rename and add jailhouse and various device trees Rename to match device tree name. Add jailhouse and several device trees. Enable jailhouse by adding jailhouse to DISTRO_FEATURES. Signed-off-by: Tom Hochstein --- .../{imx8mpevk.conf => imx8mp-evk.conf} | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) rename conf/machine/{imx8mpevk.conf => imx8mp-evk.conf} (74%) diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mp-evk.conf similarity index 74% rename from conf/machine/imx8mpevk.conf rename to conf/machine/imx8mp-evk.conf index 06549d75..1ae9e1ae 100644 --- a/conf/machine/imx8mpevk.conf +++ b/conf/machine/imx8mp-evk.conf @@ -1,15 +1,15 @@ #@TYPE: Machine -#@NAME: NXP i.MX8MP Evaluation Kit and i.MX8MP Evaluation Kit +#@NAME: NXP i.MX 8M Plus EVK #@SOC: i.MX8MP -#@DESCRIPTION: Machine configuration for NXP i.MX8MP EVK -#@MAINTAINER: Alexandru Palalau +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Plus Evaluation Kit +#@MAINTAINER: Jun Zhu MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc -MACHINE_FEATURES += "pci wifi bluetooth optee" +MACHINE_FEATURES += "pci wifi bluetooth optee jailhouse" MACHINE_FEATURES_append_use-nxp-bsp = " mrvl8997" # Mainline kernel contains only one DTB file for @@ -21,23 +21,30 @@ KERNEL_DEVICETREE = "freescale/imx8mp-evk.dtb" KERNEL_DEVICETREE_append_use-nxp-bsp = " \ freescale/imx8mp-ab2.dtb \ freescale/imx8mp-evk-basler.dtb \ + freescale/imx8mp-evk-basler-ov5640.dtb \ freescale/imx8mp-evk-dsp.dtb \ + freescale/imx8mp-evk-dsp-lpa.dtb \ + freescale/imx8mp-evk-dual-ov2775.dtb \ freescale/imx8mp-evk-flexcan2.dtb \ freescale/imx8mp-evk-inmate.dtb \ - freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ + freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ freescale/imx8mp-evk-ov2775.dtb \ + freescale/imx8mp-evk-ov2775-ov5640.dtb \ + freescale/imx8mp-evk-pcie-ep.dtb \ freescale/imx8mp-evk-rm67191.dtb \ freescale/imx8mp-evk-root.dtb \ freescale/imx8mp-evk-rpmsg.dtb \ freescale/imx8mp-evk-sof-wm8960.dtb \ + freescale/imx8mp-evk-spdif-lb.dtb \ " UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8mp_evk_defconfig,sdcard" -UBOOT_CONFIG[fspi] = "imx8mp_evk_defconfig" -UBOOT_CONFIG[ecc] = "imx8mp_evk_inline_ecc_defconfig" +UBOOT_CONFIG[sd] = "imx8mp_evk_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "imx8mp_evk_defconfig" +UBOOT_CONFIG[ecc] = "imx8mp_evk_inline_ecc_defconfig" UBOOT_CONFIG[mfgtool] = "imx8mp_evk_defconfig" + SPL_BINARY = "spl/u-boot-spl.bin" # Set DDR FIRMWARE -- 2.40.1