Merge pull request #1641 from thochstein/imx8dxlevk

Add 8DXL B0 EVK support
This commit is contained in:
Otavio Salvador 2023-08-21 16:45:59 -03:00 committed by GitHub
commit e4d721f735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 99 additions and 53 deletions

View File

@ -52,6 +52,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V38 = "65c483bb431ccd9a1820e687
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V39 = "5a0bf11f745e68024f37b4724a5364fe"
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V40 = "add2d392714d3096ed7e0f7e2190724b"
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V42 = "ea25d099982d035af85d193c88a1b479"
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V44 = "d7853b7bf2936b2c25c893eac7033374"
FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V45 = "63a38e9f392d8813d6f1f4d0d6fbe657"
FSL_EULA_FILE_MD5SUMS = " \
@ -101,6 +102,7 @@ FSL_EULA_FILE_MD5SUMS = " \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V39} \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V40} \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V42} \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V44} \
${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V45} \
"

View File

@ -16,15 +16,13 @@
# This behavior ensures that derivatives which requires SECO Firmware to be
# present in the image file have it properly defined.
SECO_FIRMWARE_NAME ?= ""
SECO_FIRMWARE_NAME:mx8qm-generic-bsp ?= "mx8qmb0-ahab-container.img"
SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= \
"${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
'mx8qxc0-ahab-container.img', d)}"
SECO_FIRMWARE_NAME:mx8dx-generic-bsp ?= "mx8qxc0-ahab-container.img"
SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxla1-ahab-container.img"
SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulpa1-ahab-container.img"
SECO_FIRMWARE_NAME:mx93-generic-bsp ?= "mx93a0-ahab-container.img"
SECO_FIRMWARE_NAME ?= ""
SECO_FIRMWARE_NAME:mx8qm-generic-bsp ?= "mx8qm${IMX_SOC_REV_LOWER}-ahab-container.img"
SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
SECO_FIRMWARE_NAME:mx8dx-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxl${IMX_SOC_REV_LOWER}-ahab-container.img"
SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}-ahab-container.img"
SECO_FIRMWARE_NAME:mx93-generic-bsp ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
python () {
if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):

View File

@ -0,0 +1,9 @@
#@TYPE: Machine
#@NAME: i.MX 8DXL A1 EVK with DDR3L
#@SOC: i.MX8DXL A1
#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite A1 Evaluation Kit with DDR3L
#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
require conf/machine/include/imx8dxl-ddr3l-evk.inc
IMX_SOC_REV = "A1"

View File

@ -0,0 +1,9 @@
#@TYPE: Machine
#@NAME: i.MX 8DXL A1 EVK with LPDDR4
#@SOC: i.MX8DXL A1
#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite A1 Evaluation Kit with LPDDR4
#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
require conf/machine/include/imx8dxl-lpddr4-evk.inc
IMX_SOC_REV = "A1"

View File

@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: i.MX 8DXL B0 EVK with DDR3L
#@SOC: i.MX8DXL B0
#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite B0 Evaluation Kit with DDR3L
#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
require conf/machine/include/imx8dxl-ddr3l-evk.inc
IMX_SOC_REV = "B0"
MACHINE_FEATURES:append:use-nxp-bsp = " optee"

View File

@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: i.MX 8DXL B0 EVK with LPDDR4
#@SOC: i.MX8DXL B0
#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite B0 Evaluation Kit with LPDDR4
#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
require conf/machine/include/imx8dxl-lpddr4-evk.inc
IMX_SOC_REV = "B0"
MACHINE_FEATURES:append:use-nxp-bsp = " optee"

View File

@ -169,6 +169,21 @@ DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55"
INHERIT += "machine-overrides-extender"
IMX_SOC_REV ??= "A0"
IMX_SOC_REV:mx8qm-generic-bsp ??= "B0"
IMX_SOC_REV:mx8qxp-generic-bsp ??= \
"${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'B0', \
'C0', d)}"
IMX_SOC_REV:mx8dx-generic-bsp ??= "C0"
# WARNING: Don't set a default for 8DXL since an image built with A1 can brick a B0 board
#IMX_SOC_REV:mx8dxl-generic-bsp ??= ""
IMX_SOC_REV:mx8ulp-generic-bsp ??= \
"${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \
'A2', d)}"
IMX_SOC_REV_LOWER = "${@d.getVar('IMX_SOC_REV').lower()}"
IMX_SOC_REV_UPPER = "${@d.getVar('IMX_SOC_REV').upper()}"
#######
### NXP BSP specific overrides
#######
@ -200,7 +215,7 @@ MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxd
MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp"
MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8dxl-generic-bsp:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-nxp-bsp"
MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-generic-bsp:mx8dxl-nxp-bsp"
MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp"

View File

@ -1,12 +1,9 @@
#@TYPE: Machine
#@NAME: i.MX 8DXL EVK with DDR3
#@SOC: i.MX8DXL
#@DESCRIPTION: NXP i.MX 8DXLite Evaluation Kit with DDR3
#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
require conf/machine/include/imx8dxl-evk.inc
KERNEL_DEVICETREE_BASENAME = "imx8dxl-ddr3l-evk"
UBOOT_CONFIG_BASENAME = "imx8dxl_ddr3l_evk"
UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_BASENAME}_nand_defconfig"
BOARD_TYPE = "ddr3-evk"

View File

@ -1,11 +1,7 @@
#@TYPE: Machine
#@NAME: i.MX 8DXL EVK with LPDDR4
#@SOC: i.MX8DXL
#@DESCRIPTION: i.MX 8DXLite Evaluation Kit with LPDDR4
#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
require conf/machine/include/imx8dxl-evk.inc
KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk"
KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \
@ -13,6 +9,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
"
UBOOT_CONFIG_BASENAME = "imx8dxl_evk"
UBOOT_CONFIG[lcd] = "${UBOOT_CONFIG_BASENAME}_lcd_defconfig"

View File

@ -0,0 +1,27 @@
# Copyright 2021-2023 NXP
SUMMARY = "NXP i.MX Sentinel firmware"
DESCRIPTION = "Firmware for i.MX Sentinel Security Controller"
SECTION = "base"
LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
SRC_URI[md5sum] = "a92e272d665a3b3bb9281253d5eca69f"
SRC_URI[sha256sum] = "be862b62c849510cce08ec24c1ddf53d826458e326e5a7f09c4b35092d6f9950"
do_compile[noexec] = "1"
do_install() {
install -Dm 0644 ${S}/${SECO_FIRMWARE_NAME} ${D}${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}
}
do_deploy() {
install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
}
addtask deploy after do_compile before do_build
FILES:${PN} += "${nonarch_base_libdir}/firmware/imx/ele/${SECO_FIRMWARE_NAME}"
COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"

View File

@ -1,23 +0,0 @@
# Copyright 2021-2022 NXP
SUMMARY = "NXP i.MX Sentinel firmware"
DESCRIPTION = "Firmware for i.MX Sentinel Security Controller"
SECTION = "base"
LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
inherit fsl-eula-unpack use-imx-security-controller-firmware deploy nopackages
SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
SRC_URI[md5sum] = "be47a5e59c1192ee36246af97d5d1532"
SRC_URI[sha256sum] = "1003d4c6773c153ea341911a74e25c249423644f70f3d8f8d085599e00770b3f"
do_compile[noexec] = "1"
do_install[noexec] = "1"
do_deploy () {
# Deploy the related firmware to be package by imx-boot
install -m 0644 ${S}/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
}
addtask deploy after do_install before do_build
COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx9-nxp-bsp)"

View File

@ -68,14 +68,7 @@ SOC_FAMILY:mx8x-generic-bsp = "mx8x"
SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
SOC_FAMILY:mx93-generic-bsp = "mx93"
REV_OPTION ?= ""
REV_OPTION:mx8qxp-generic-bsp = \
"${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \
'REV=C0', d)}"
REV_OPTION:mx8dx-generic-bsp = "REV=C0"
REV_OPTION:mx8ulp-generic-bsp = \
"${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', '', \
'REV=A1', d)}"
REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
do_uboot_assemble_fitimage:prepend:imx-generic-bsp() {
for config in ${UBOOT_MACHINE}; do