summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Nie <jun.nie@linaro.org>2021-03-11 17:03:30 +0800
committerJun Nie <jun.nie@linaro.org>2021-03-11 22:19:14 +0800
commit98ffa6a022da3543589284787660b94cdfedb8c6 (patch)
treea3d567e0d0977074fdabb21153c9ebf3372e9205
parentb8db1a8fb631dfb85b5fc1a0ec3e519f79c912b7 (diff)
bsp: Add Advantech imx8mp rsb3720 platform
Signed-off-by: Jun Nie <jun.nie@linaro.org>
-rw-r--r--meta-lmp-base/recipes-security/optee/optee-os-fio/0001-plat-imx-conf-Add-mx8mp-flavor.patch (renamed from meta-lmp-base/recipes-security/optee/optee-os-fio/optee-os-imx8mp.diff)27
-rw-r--r--meta-lmp-bsp/conf/machine/imx8mprsb3720.conf64
-rw-r--r--meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc8
-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-imx8mprsb3720.dts1
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/boot.cmd3
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/uEnv.txt.in7
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx8mprsb3720/lmp.cfg98
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/fw_env.config1
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp-base.cfg26
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp.cfg92
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend4
-rw-r--r--meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/imx8mprsb3720/boot.cmd21
-rw-r--r--meta-lmp-bsp/recipes-core/base-files/base-files/imx8mprsb3720/fstab8
-rw-r--r--meta-lmp-bsp/recipes-kernel/linux/linux-lmp-fslc-imx_git.bb17
-rw-r--r--meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.10.0.bbappend4
-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.bbappend7
-rw-r--r--meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8mprsb3720/bootloader.uuu.in16
-rw-r--r--meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8mprsb3720/full_image.uuu.in17
20 files changed, 417 insertions, 12 deletions
diff --git a/meta-lmp-base/recipes-security/optee/optee-os-fio/optee-os-imx8mp.diff b/meta-lmp-base/recipes-security/optee/optee-os-fio/0001-plat-imx-conf-Add-mx8mp-flavor.patch
index be43dc5..5d5a260 100644
--- a/meta-lmp-base/recipes-security/optee/optee-os-fio/optee-os-imx8mp.diff
+++ b/meta-lmp-base/recipes-security/optee/optee-os-fio/0001-plat-imx-conf-Add-mx8mp-flavor.patch
@@ -1,18 +1,29 @@
+From 0d9bec62f4dcffb2aaa490d6b297406383b1b35d Mon Sep 17 00:00:00 2001
+From: Jun Nie <jun.nie@linaro.org>
+Date: Thu, 11 Mar 2021 15:02:09 +0800
+Subject: [PATCH] plat-imx: conf: Add mx8mp flavor
+
+Signed-off-by: Jun Nie <jun.nie@linaro.org>
+---
+ core/arch/arm/plat-imx/conf.mk | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
-index e13b3675..9bfb9b54 100644
+index e13b3675..2ba96f5e 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
-@@ -66,6 +66,9 @@ mx8mq-flavorlist = \
+@@ -66,6 +66,10 @@ mx8mq-flavorlist = \
mx8mm-flavorlist = \
mx8mmevk
+mx8mp-flavorlist = \
++ mx8mprsb3720 \
+ mx8mpevk
+
mx8mn-flavorlist = \
mx8mnevk
-@@ -164,6 +167,14 @@ CFG_IMX_I2C_CLK_RATE ?= 24000000
+@@ -164,6 +168,14 @@ CFG_IMX_I2C_CLK_RATE ?= 24000000
CFG_IMX_UART ?= y
CFG_DRAM_BASE ?= 0x40000000
CFG_TEE_CORE_NB_CORE ?= 4
@@ -27,7 +38,7 @@ index e13b3675..9bfb9b54 100644
else ifneq (,$(filter $(PLATFORM_FLAVOR),$(mx8mn-flavorlist)))
$(call force,CFG_MX8MN,y)
$(call force,CFG_ARM64_core,y)
-@@ -327,6 +338,11 @@ CFG_DDR_SIZE ?= 0x80000000
+@@ -327,6 +339,16 @@ CFG_DDR_SIZE ?= 0x80000000
CFG_UART_BASE ?= UART2_BASE
endif
@@ -36,6 +47,14 @@ index e13b3675..9bfb9b54 100644
+CFG_UART_BASE ?= UART2_BASE
+endif
+
++ifneq (,$(filter $(PLATFORM_FLAVOR),mx8mprsb3720))
++CFG_DDR_SIZE ?= 0x80000000
++CFG_UART_BASE ?= UART2_BASE
++endif
++
ifneq (,$(filter $(PLATFORM_FLAVOR),mx8mnevk))
CFG_DDR_SIZE ?= 0x80000000
CFG_UART_BASE ?= UART2_BASE
+--
+2.25.1
+
diff --git a/meta-lmp-bsp/conf/machine/imx8mprsb3720.conf b/meta-lmp-bsp/conf/machine/imx8mprsb3720.conf
new file mode 100644
index 0000000..1a3c0ea
--- /dev/null
+++ b/meta-lmp-bsp/conf/machine/imx8mprsb3720.conf
@@ -0,0 +1,64 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX8MP Evaluation Kit and i.MX8MP Evaluation Kit
+#@SOC: i.MX8MP
+#@DESCRIPTION: Machine configuration for NXP i.MX8MP EVK
+#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
+
+MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:imx8mprsb3720:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa53.inc
+
+MACHINE_FEATURES += " pci wifi bluetooth optee nxp8997"
+
+KERNEL_DEVICETREE = " \
+ freescale/imx8mp-rsb3720-a1.dtb \
+ freescale/imx8mp-rsb3720-a1-lvds0-auo.dtb \
+ freescale/imx8mp-rsb3720-a1-lvds1-auo.dtb \
+ freescale/imx8mp-rsb3720-a1-lvds-dual.dtb \
+ freescale/imx8mp-rsb3720-a1-adv7535.dtb \
+ freescale/imx8mp-rsb3720-a1-auog101uan02.dtb \
+ freescale/imx8mp-rsb3720-a1-basler.dtb \
+"
+
+#WKS_FILE_DEPENDS_append = " imx-m7-demos"
+#IMAGE_BOOT_FILES += "imx8mp_m7_TCM_hello_world.bin \
+# imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
+# imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \
+# imx8mp_m7_TCM_sai_low_power_audio.bin \
+#"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "imx8mp_rsb3720a1_6G_defconfig,sdcard"
+UBOOT_CONFIG[fspi] = "imx8mp_rsb3720a1_6G_defconfig"
+UBOOT_CONFIG[mfgtool] = "imx8mp_rsb3720a1_6G_defconfig"
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+# Set DDR FIRMWARE
+DDR_FIRMWARE_NAME = " \
+ lpddr4_pmu_train_1d_dmem_201904.bin \
+ lpddr4_pmu_train_1d_imem_201904.bin \
+ lpddr4_pmu_train_2d_dmem_201904.bin \
+ lpddr4_pmu_train_2d_imem_201904.bin \
+"
+
+# Set u-boot DTB
+UBOOT_DTB_NAME = "imx8mp-rsb3720-a1.dtb"
+
+# Set imx-mkimage boot target
+IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}"
+
+# Set Serial console
+SERIAL_CONSOLES = "115200;ttymxc2"
+
+IMAGE_BOOTLOADER = "imx-boot"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+IMX_BOOT_SEEK = "32"
+
+OPTEE_BIN_EXT = "8mp"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
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 82966cf..52f35e6 100644
--- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
+++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
@@ -354,12 +354,18 @@ 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 RSB3720
+OSTREE_KERNEL_ARGS_imx8mprsb3720 ?= "console=tty1 console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200 root=/dev/mmcblk2p2 rootfstype=ext4"
+PREFERRED_PROVIDER_virtual/dtb_imx8mprsb3720 ?= "lmp-device-tree"
+SOTA_CLIENT_FEATURES_append_imx8mprsb3720 = " ubootenv"
+MACHINE_FEATURES_remove_imx8mprsb3720 = "qca9377 qca6174"
+UBOOT_MACHINE_imx8mprsb3720 = "imx8mp_evk_config"
## 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 = "imx8mp_evk_config"
+UBOOT_MACHINE_imx8mpevk = "imx8mp_evk_defconfig"
# STM32MP1
PREFERRED_PROVIDER_virtual/kernel_stm32mp1common ?= "linux-lmp-stm32"
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 95cca16..992a91c 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
@@ -17,3 +17,7 @@ SRC_URI_append_imx8mpevk = " \
file://freescale_fsl-imx8mp-evk.dts \
"
COMPATIBLE_MACHINE_imx8mpevk = ".*"
+SRC_URI_append_imx8mprsb3720 = " \
+ file://freescale_fsl-imx8mprsb3720.dts \
+"
+COMPATIBLE_MACHINE_imx8mprsb3720 = ".*"
diff --git a/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree/freescale_fsl-imx8mprsb3720.dts b/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree/freescale_fsl-imx8mprsb3720.dts
new file mode 100644
index 0000000..a1b702c
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree/freescale_fsl-imx8mprsb3720.dts
@@ -0,0 +1 @@
+#include "imx8mp-rsb3720-a1.dts"
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/boot.cmd b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/boot.cmd
new file mode 100644
index 0000000..c932969
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/boot.cmd
@@ -0,0 +1,3 @@
+fatload mmc ${emmc_dev}:1 ${loadaddr} /uEnv.txt
+env import -t ${loadaddr} ${filesize}
+run bootcmd
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/uEnv.txt.in b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/uEnv.txt.in
new file mode 100644
index 0000000..8f07bf9
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/imx8mprsb3720/uEnv.txt.in
@@ -0,0 +1,7 @@
+devnum=2
+devtype=mmc
+bootcmd_args=setenv bootargs console=tty1 console=${console} root=/dev/mmcblk2p2 rootfstype=ext4 rootwait rw
+bootcmd_dtb=fatload ${devtype} ${devnum}:1 ${fdt_addr} ${fdt_file}
+bootcmd_load_k=fatload ${devtype} ${devnum}:1 ${loadaddr} ${image}
+bootcmd_run=booti ${loadaddr} - ${fdt_addr}
+bootcmd=run bootcmd_args; run bootcmd_dtb; run bootcmd_load_k; run bootcmd_run
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx8mprsb3720/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx8mprsb3720/lmp.cfg
new file mode 100644
index 0000000..c39464d
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx8mprsb3720/lmp.cfg
@@ -0,0 +1,98 @@
+CONFIG_SPL_DM=y
+CONFIG_SPL_FIT=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_LOAD_FIT=y
+# CONFIG_SPL_FIT_IMAGE_TINY is not set
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_CRYPTO_SUPPORT=y
+CONFIG_SPL_HASH_SUPPORT=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_RSA=y
+CONFIG_HASH=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+# CONFIG_SPL_DM_USB is not set
+# CONFIG_SPL_PARTITION_UUIDS is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_CMD_DEKBLOB is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_FIT=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_SIGNATURE_STRICT=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_FIT_SIGNATURE_STRICT=y
+CONFIG_FIT_VERBOSE=y
+# CONFIG_LEGACY_IMAGE_FORMAT is not set
+CONFIG_IMX_HAB=y
+# CONFIG_SPL_IMX_HAB is not set
+CONFIG_PARTITION_UUIDS=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_FIOVB=y
+CONFIG_CMD_FIOVB=y
+CONFIG_CMD_XIMG=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_USB_GADGET_MASS_STORAGE=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_UUU_SUPPORT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x42800000
+CONFIG_FASTBOOT_BUF_SIZE=0x40000000
+CONFIG_FSL_FASTBOOT_BOOTLOADER2=y
+CONFIG_FSL_FASTBOOT_BOOTLOADER2_OFFSET=0x300
+CONFIG_BOOTDELAY=-2
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="reset"
+CONFIG_ENV_IS_NOWHERE=y
+# CONFIG_ENV_IS_IN_MMC is not set
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+# CONFIG_SPL_DM_MMC is not set
+# CONFIG_SPL_MMC_SUPPORT is not set
+# CONFIG_SPL_BLK is not set
+# CONFIG_NET is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_DHCP is not set
+# CONFIG_CMD_BOOTP is not set
+# CONFIG_CMD_TFTPBOOT is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_SYSBOOT is not set
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_BMODE is not set
+# CONFIG_CMD_PXE is not set
+# CONFIG_CMD_SATA is not set
+# CONFIG_CMD_USB_MASS_STORAGE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_BOOTZ is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_EFI_LOADER is not set
+# CONFIG_SATA is not set
+# CONFIG_DWC_AHSATA is not set
+# CONFIG_DM_SCSI is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_KEYBOARD is not set
+# CONFIG_USB_HOST_ETHER is not set
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
+# CONFIG_DISTRO_DEFAULTS is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_DM_VIDEO is not set
+# CONFIG_VIDEO_BRIDGE is not set
+# CONFIG_VIDEO_SEC_MIPI_DSI is not set
+# CONFIG_VIDEO_IMX_SEC_DSI is not set
+# CONFIG_VIDEO_LINK is not set
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/fw_env.config b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/fw_env.config
new file mode 100644
index 0000000..60b4980
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/fw_env.config
@@ -0,0 +1 @@
+/mnt/boot/uboot.env 0x0000 0x4000
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp-base.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp-base.cfg
new file mode 100644
index 0000000..a4e46f1
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp-base.cfg
@@ -0,0 +1,26 @@
+CONFIG_SPL_DM=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_FIT=y
+CONFIG_SPL_LOAD_FIT=y
+# CONFIG_SPL_FIT_IMAGE_TINY is not set
+# CONFIG_CMD_DEKBLOB is not set
+# CONFIG_SPL_DM_USB is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_FIT=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_PARTITION_UUIDS=y
+CONFIG_CMD_XIMG=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+# CONFIG_ENV_IS_IN_MMC is not set
+CONFIG_ENV_IS_IN_FAT=y
+CONFIG_ENV_FAT_INTERFACE="mmc"
+CONFIG_ENV_FAT_DEVICE_AND_PART="2:1"
+CONFIG_ENV_SIZE=0x4000
+CONFIG_CMD_IMPORTENV=y
+CONFIG_CMD_EDITENV=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="fatload mmc ${emmc_dev}:1 ${loadaddr} /boot.scr; source ${loadaddr}; reset"
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp.cfg
new file mode 100644
index 0000000..5bf6561
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx8mprsb3720/lmp.cfg
@@ -0,0 +1,92 @@
+CONFIG_SPL_DM=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_FIT=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_LOAD_FIT=y
+# CONFIG_SPL_FIT_IMAGE_TINY is not set
+CONFIG_SPL_CRYPTO_SUPPORT=y
+CONFIG_SPL_HASH_SUPPORT=y
+CONFIG_RSA=y
+CONFIG_HASH=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+# CONFIG_SPL_PARTITION_UUIDS is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_DM_USB is not set
+# CONFIG_SPL_USB_HOST_SUPPORT is not set
+# CONFIG_SPL_USB_GADGET is not set
+# CONFIG_SPL_USB_SDP_SUPPORT is not set
+# CONFIG_CMD_DEKBLOB is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_FIT=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_SIGNATURE_STRICT=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_FIT_SIGNATURE_STRICT=y
+CONFIG_FIT_VERBOSE=y
+# CONFIG_LEGACY_IMAGE_FORMAT is not set
+CONFIG_PARTITION_UUIDS=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_FIOVB=y
+CONFIG_CMD_FIOVB=y
+CONFIG_CMD_XIMG=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+# CONFIG_ENV_IS_IN_MMC is not set
+CONFIG_ENV_IS_IN_FAT=y
+CONFIG_ENV_FAT_INTERFACE="mmc"
+CONFIG_ENV_FAT_DEVICE_AND_PART="2:1"
+CONFIG_ENV_SIZE=0x4000
+CONFIG_CMD_IMPORTENV=y
+CONFIG_CMD_EDITENV=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
+CONFIG_BOOTDELAY=-2
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="fatload mmc 2:1 ${loadaddr} /boot.itb; setenv verify 1; source ${loadaddr}; reset"
+# CONFIG_SPL_DM_MMC is not set
+# CONFIG_SPL_BLK is not set
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_SYSBOOT is not set
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_BMODE is not set
+# CONFIG_CMD_PXE is not set
+# CONFIG_CMD_SATA is not set
+# CONFIG_CMD_USB is not set
+# CONFIG_CMD_USB_MASS_STORAGE is not set
+# CONFIG_CMD_USB_SDP is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_BOOTZ is not set
+# CONFIG_CMD_FUSE is not set
+# CONFIG_CMD_GPIO is not set
+# CONFIG_CMD_I2C is not set
+# CONFIG_EFI_LOADER is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_EXT4_WRITE is not set
+# CONFIG_SATA is not set
+# CONFIG_DWC_AHSATA is not set
+# CONFIG_DM_SCSI is not set
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
+# CONFIG_FASTBOOT is not set
+# CONFIG_USB is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_KEYBOARD is not set
+# CONFIG_USB_HOST_ETHER is not set
+# CONFIG_USB_TCPC is not set
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_DM_VIDEO is not set
+# CONFIG_VIDEO_BRIDGE is not set
+# CONFIG_VIDEO_SEC_MIPI_DSI is not set
+# CONFIG_VIDEO_IMX_SEC_DSI is not set
+# CONFIG_VIDEO_LINK is not set
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend
index 11329be..4b8bbbc 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend
@@ -4,8 +4,8 @@ BOOT_TOOLS_mx8 = "imx-boot-tools"
SRC_URI_remove_mx8mp = "git://github.com/foundriesio/u-boot.git;branch=${SRCBRANCH}"
SRC_URI_prepend_mx8mp = "git://git.linaro.org/people/jun.nie/u-boot.git;protocol=https;branch=${SRCBRANCH} "
-SRCREV_mx8mp = "ab3269e5f5210dd11f32ca8fabe78693d4c0998e"
-SRCBRANCH_mx8mp = "rel_imx_5.4.70_2.3.0-imx8mp-2020.04+efi+fio"
+SRCREV_mx8mp = "c872ea56226373dbfeb4a1ca7fb48aa5b53dcb5b"
+SRCBRANCH_mx8mp = "rel_imx_5.4.70_2.3.0-imx8mp-2020.04+efi+fio+advant"
# From u-boot-imx/meta-freescale
do_deploy_append_mx8m() {
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/imx8mprsb3720/boot.cmd b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/imx8mprsb3720/boot.cmd
new file mode 100644
index 0000000..85ab4cf
--- /dev/null
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/imx8mprsb3720/boot.cmd
@@ -0,0 +1,21 @@
+echo "Using freescale_${fdt_file}"
+
+# Default boot type and device
+setenv bootlimit 3
+setenv devtype mmc
+setenv devnum 2
+
+setenv bootcmd_resetvars 'setenv kernel_image; setenv bootargs; setenv kernel_image2; setenv bootargs2'
+setenv bootcmd_otenv 'run bootcmd_resetvars; ext4load ${devtype} ${devnum}:2 ${loadaddr} /boot/loader/uEnv.txt; env import -t ${loadaddr} ${filesize}'
+setenv bootcmd_load_f 'ext4load ${devtype} ${devnum}:2 ${initrd_addr} "/boot"${kernel_image}'
+setenv bootcmd_run 'bootm ${initrd_addr}#conf@freescale_${fdt_file}'
+setenv bootcmd_rollbackenv 'setenv kernel_image ${kernel_image2}; setenv bootargs ${bootargs2}'
+setenv bootcmd_set_rollback 'if test ! "${rollback}" = "1"; then setenv rollback 1; setenv upgrade_available 0; saveenv; fi'
+setenv bootostree 'run bootcmd_load_f; run bootcmd_run'
+setenv altbootcmd 'run bootcmd_otenv; run bootcmd_set_rollback; if test -n "${kernel_image2}"; then run bootcmd_rollbackenv; fi; run bootostree; reset'
+
+if test ! -e ${devtype} ${devnum}:1 uboot.env; then saveenv; fi
+
+if test "${rollback}" = "1"; then run altbootcmd; else run bootcmd_otenv; run bootostree; if test ! "${upgrade_available}" = "1"; then setenv upgrade_available 1; saveenv; fi; reset; fi
+
+reset
diff --git a/meta-lmp-bsp/recipes-core/base-files/base-files/imx8mprsb3720/fstab b/meta-lmp-bsp/recipes-core/base-files/base-files/imx8mprsb3720/fstab
new file mode 100644
index 0000000..ed7ed07
--- /dev/null
+++ b/meta-lmp-bsp/recipes-core/base-files/base-files/imx8mprsb3720/fstab
@@ -0,0 +1,8 @@
+/dev/root / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
+
+# boot partition
+/dev/mmcblk2p1 /mnt/boot vfat noatime,sync 0 0
diff --git a/meta-lmp-bsp/recipes-kernel/linux/linux-lmp-fslc-imx_git.bb b/meta-lmp-bsp/recipes-kernel/linux/linux-lmp-fslc-imx_git.bb
index c91e696..8e54067 100644
--- a/meta-lmp-bsp/recipes-kernel/linux/linux-lmp-fslc-imx_git.bb
+++ b/meta-lmp-bsp/recipes-kernel/linux/linux-lmp-fslc-imx_git.bb
@@ -1,17 +1,22 @@
include recipes-kernel/linux/kmeta-linux-lmp-5.4.y.inc
LINUX_VERSION ?= "5.4.97"
+KERNEL_VERSION_SANITY_SKIP="1"
KBRANCH = "5.4-2.1.x-imx"
SRCREV_machine = "ff3256b1fc18e299fe6bb92d75515f9708de6f17"
-KERNEL_META_COMMIT_imx8mpevk = "42974ffd95a2861aeb58d7d08fdf3b8d125285bc"
+
+KERNEL_REPO = "git://github.com/Freescale/linux-fslc.git;protocol=https;branch=${KBRANCH};name=machine;"
+KERNEL_REPO_imx8mprsb3720 = "git://github.com/ADVANTECH-Corp/linux-imx.git;protocol=https;branch=adv_5.4.70_2.3.0;name=machine;"
+SRCREV_machine_imx8mprsb3720 = "f0600803f35148627c4c052c5a6b8fd39f16c86f"
+KERNEL_META_COMMIT_mx8mp = "e6aae67c045fbb2969fff5cd309ed6496b15fc30"
SRCREV_meta = "${KERNEL_META_COMMIT}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-KERNEL_META_REPO_imx8mpevk = "git://git.linaro.org/people/jun.nie/kernel-meta.git"
-KERNEL_META_BRANCH_imx8mpevk = "linux-v5.4.y+mx8mp"
+KERNEL_META_REPO_mx8mp = "git://git.linaro.org/people/jun.nie/kernel-meta.git"
+KERNEL_META_BRANCH_mx8mp = "linux-v5.4.y+mx8mp"
-SRC_URI = "git://github.com/Freescale/linux-fslc.git;protocol=https;branch=${KBRANCH};name=machine; \
+SRC_URI = "${KERNEL_REPO} \
${KERNEL_META_REPO};protocol=${KERNEL_META_REPO_PROTOCOL};type=kmeta;name=meta;branch=${KERNEL_META_BRANCH};destsuffix=${KMETA} \
file://0001-FIO-fromtree-drivers-optee-allow-op-tee-to-access-de.patch \
file://0002-FIO-fromtree-hwrng-optee-handle-unlimited-data-rates.patch \
@@ -24,6 +29,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;protocol=https;branch=${KBR
file://0001-FIO-fromtree-ath10k-add-QCA9377-sdio-hw_param-item.patch \
"
+SRC_URI_remove_imx8mprsb3720 = "file://0001-FIO-fromtree-tee-add-support-for-session-s-client-UU.patch"
+SRC_URI_remove_imx8mprsb3720 = "file://0002-FIO-fromtree-tee-optee-Add-support-for-session-login.patch"
+SRC_URI_remove_imx8mprsb3720 = "file://0001-driver-tee-Handle-NULL-pointer-indication-from-clien.patch"
+
KMETA = "kernel-meta"
include recipes-kernel/linux/linux-lmp.inc
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.10.0.bbappend b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.10.0.bbappend
index d9289af..5b2016b 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.10.0.bbappend
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_3.10.0.bbappend
@@ -2,6 +2,7 @@ OPTEEMACHINE_apalis-imx6 = "imx-mx6qapalis"
OPTEEMACHINE_imx6ullevk = "imx-mx6ullevk"
OPTEEMACHINE_imx8mmevk = "imx-mx8mmevk"
OPTEEMACHINE_imx8mpevk = "imx-mx8mpevk"
+OPTEEMACHINE_imx8mprsb3720 = "imx-mx8mprsb3720"
OPTEEMACHINE_imx8mqevk = "imx-mx8mqevk"
EXTRA_OEMAKE_append_imx = " \
@@ -29,3 +30,6 @@ EXTRA_OEMAKE_append_imx8mmevk = " \
EXTRA_OEMAKE_append_imx8mpevk = " \
CFG_CORE_DYN_SHM=n CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x43200000 \
"
+EXTRA_OEMAKE_append_imx8mprsb3720 = " \
+ CFG_CORE_DYN_SHM=n CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x43200000 \
+"
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 abceef4..3f6df12 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
@@ -2,6 +2,7 @@ OPTEEMACHINE_imx7ulpea-ucom = "imx-mx7ulpeaucom"
OPTEEMACHINE_apalis-imx6 = "imx-mx6qapalis"
OPTEEMACHINE_imx8mmevk = "imx-imx8mmevk"
OPTEEMACHINE_imx8mpevk = "imx-imx8mpevk"
+OPTEEMACHINE_imx8mprsb3720 = "imx-imx8mprsb3720"
OPTEEMACHINE_imx6ullevk = "imx-mx6ullevk"
EXTRA_OEMAKE_append_apalis-imx6 = " \
@@ -20,6 +21,9 @@ EXTRA_OEMAKE_append_imx8mmevk = " \
EXTRA_OEMAKE_append_imx8mpevk = " \
CFG_DT=y CFG_OVERLAY_ADDR=0x43600000 \
"
+EXTRA_OEMAKE_append_imx8mprsb3720 = " \
+ 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 5567bb5..b665d39 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
@@ -4,10 +4,11 @@ OPTEEMACHINE_imx6ullevk = "imx-mx6ullevk"
OPTEEMACHINE_imx8mqevk = "imx-mx8mqevk"
OPTEEMACHINE_imx8mmevk = "imx-mx8mmevk"
OPTEEMACHINE_imx8mpevk = "imx-mx8mpevk"
+OPTEEMACHINE_imx8mprsb3720 = "imx-mx8mprsb3720"
OPTEEMACHINE_uz = "zynqmp-zcu102"
SRC_URI += " \
- file://optee-os-imx8mp.diff \
+ file://0001-plat-imx-conf-Add-mx8mp-flavor.patch \
"
EXTRA_OEMAKE_append_imx = " \
@@ -37,6 +38,10 @@ 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_imx8mprsb3720 = " \
+ 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-support/mfgtool-files/mfgtool-files/imx8mprsb3720/bootloader.uuu.in b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8mprsb3720/bootloader.uuu.in
new file mode 100644
index 0000000..dfaf6ff
--- /dev/null
+++ b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8mprsb3720/bootloader.uuu.in
@@ -0,0 +1,16 @@
+uuu_version 1.2.39
+
+SDP: boot -f imx-boot-mfgtool
+
+SDPV: delay 1000
+SDPV: write -f u-boot-mfgtool.itb
+SDPV: jump
+
+FB: ucmd setenv fastboot_dev mmc
+FB: ucmd setenv mmcdev ${emmc_dev}
+FB: ucmd mmc dev ${emmc_dev}
+FB: flash bootloader ../imx-boot-@@MACHINE@@
+FB: flash bootloader2 ../u-boot-@@MACHINE@@.itb
+FB: ucmd if env exists emmc_ack; then ; else setenv emmc_ack 0; fi;
+FB: ucmd mmc partconf ${emmc_dev} ${emmc_ack} 1 0
+FB: done
diff --git a/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8mprsb3720/full_image.uuu.in b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8mprsb3720/full_image.uuu.in
new file mode 100644
index 0000000..3efe1b0
--- /dev/null
+++ b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8mprsb3720/full_image.uuu.in
@@ -0,0 +1,17 @@
+uuu_version 1.2.39
+
+SDP: boot -f imx-boot-mfgtool
+
+SDPV: delay 1000
+SDPV: write -f u-boot-mfgtool.itb
+SDPV: jump
+
+FB: ucmd setenv fastboot_dev mmc
+FB: ucmd setenv mmcdev ${emmc_dev}
+FB: ucmd mmc dev ${emmc_dev}
+FB: flash -raw2sparse all ../@@MFGTOOL_FLASH_IMAGE@@-@@MACHINE@@.wic
+FB: flash bootloader ../imx-boot-@@MACHINE@@
+FB: flash bootloader2 ../u-boot-@@MACHINE@@.itb
+FB: ucmd if env exists emmc_ack; then ; else setenv emmc_ack 0; fi;
+FB: ucmd mmc partconf ${emmc_dev} ${emmc_ack} 1 0
+FB: done