summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@foundries.io>2021-02-23 01:08:17 +0200
committerIgor Opaniuk <igor.opaniuk@gmail.com>2021-02-24 23:25:08 +0200
commitadd9e7c3fa978ee6576915087d6c205bd863d1a3 (patch)
tree643d2eb239c6c4c6b1460a6c83499ba5879a40eb
parentcde814abcdfdab3edc86f45ce93545b173a2cbf1 (diff)
bsp: lmp-machine-custom: mx8mq: changes for imx-boot and uboot-fitmage class
Support uboot-fitimage and spl-only imx-boot image builds for iMX8MQ. Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
-rw-r--r--meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc16
-rw-r--r--meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc1
2 files changed, 13 insertions, 4 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 f1973a4..636a317 100644
--- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
+++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
@@ -273,21 +273,29 @@ PREFERRED_PROVIDER_u-boot_mx8mq ?= "u-boot-fio"
PREFERRED_PROVIDER_u-boot-fw-utils_mx8mq = "libubootenv"
PREFERRED_RPROVIDER_u-boot-fw-utils_mx8mq = "libubootenv"
UBOOT_DTB_LOADADDRESS_mx8mq = "0x43000000"
-IMAGE_BOOT_FILES_mx8mq = "imx-boot ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
-IMAGE_BOOT_FILES_sota_mx8mq = "imx-boot boot.itb"
+PREFERRED_PROVIDER_virtual/trusted-firmware-a_mx8mq ?= "imx-atf"
+EXTRA_IMAGEDEPENDS_append_mx8mq = "virtual/trusted-firmware-a"
+UBOOT_CLASSES_mx8mq = "uboot-fitimage"
+ATF_BINARY_mx8mq = "arm-trusted-firmware.bin"
+UBOOT_CONFIG_mx8mq = ""
+UBOOT_SUFFIX_mx8mq = "bin"
+IMAGE_BOOT_FILES_mx8mq = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
+IMAGE_BOOT_FILES_sota_mx8mq = "imx-boot u-boot.itb boot.itb"
WKS_FILE_DEPENDS_append_mx8mq = " u-boot-default-script"
PREFERRED_PROVIDER_u-boot-default-script_mx8mq = "u-boot-base-scr"
PREFERRED_PROVIDER_u-boot-default-script_sota_mx8mq = "u-boot-ostree-scr-fit"
KERNEL_IMAGETYPE_sota_mx8mq = "fitImage"
KERNEL_CLASSES_sota_mx8mq = " kernel-lmp-fitimage "
-OSTREE_KERNEL_ARGS_imx8mqevk ?= "console=tty1 console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 root=/dev/mmcblk0p2 rootfstype=ext4"
## iMX8: Use latest NXP BSP downstream kernel
PREFERRED_PROVIDER_virtual/kernel_mx8mq ?= "linux-lmp-fslc-imx"
-WKS_FILE_mx8mq_sota = "sdimage-imx8-sota.wks.in"
+WKS_FILE_sota_mx8mq = "sdimage-imx8-spl-sota.wks.in"
+IMXBOOT_TARGETS_mx8mq = "flash_evk_spl"
## iMX8MQ EVK
+OSTREE_KERNEL_ARGS_imx8mqevk ?= "console=tty1 console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 root=/dev/mmcblk0p2 rootfstype=ext4"
SOTA_CLIENT_FEATURES_append_imx8mqevk = " ubootenv"
MACHINE_FEATURES_remove_imx8mqevk = "qca6174"
MACHINE_FEATURES_append_imx8mqevk = " bcm4356"
+UBOOT_MACHINE_imx8mqevk ?= "imx8mq_evk_config"
# iMX8MM
UBOOT_SIGN_ENABLE_sota_mx8mm = "1"
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 e65214d..319e9bb 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
@@ -40,6 +40,7 @@ KERNEL_BRANCH_mx8mq ?= "imx_5.4.24_2.1.0"
PREFERRED_PROVIDER_virtual/bootloader_mx8mq = "u-boot-fio-mfgtool"
PREFERRED_PROVIDER_u-boot_mx8mq = "u-boot-fio-mfgtool"
PREFERRED_PROVIDER_u-boot-default-script_mx8mq = "u-boot-ostree-scr-fit"
+IMAGE_BOOT_FILES_mx8mq = "imx-boot u-boot.itb boot.itb"
KERNEL_IMAGETYPE_mx8mq = "fitImage"
KERNEL_CLASSES_mx8mq = " kernel-lmp-fitimage "