diff options
-rw-r--r-- | conf/machine/imx8mmevk.conf | 3 | ||||
-rw-r--r-- | conf/machine/imx8mnevk.conf | 3 | ||||
-rw-r--r-- | conf/machine/imx8mpevk.conf | 3 | ||||
-rw-r--r-- | recipes-bsp/imx-atf/imx-atf_2.2.bb | 25 |
4 files changed, 20 insertions, 14 deletions
diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf index 231d7ff7..fcd78fb5 100644 --- a/conf/machine/imx8mmevk.conf +++ b/conf/machine/imx8mmevk.conf | |||
@@ -56,6 +56,9 @@ DDR_FIRMWARE_NAME = " \ | |||
56 | # Set u-boot DTB | 56 | # Set u-boot DTB |
57 | UBOOT_DTB_NAME = "imx8mm-evk.dtb" | 57 | UBOOT_DTB_NAME = "imx8mm-evk.dtb" |
58 | 58 | ||
59 | # Set ATF platform name | ||
60 | ATF_PLATFORM = "imx8mm" | ||
61 | |||
59 | # Set imx-mkimage boot target | 62 | # Set imx-mkimage boot target |
60 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" | 63 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" |
61 | 64 | ||
diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf index f0d785cd..fa0cb7b4 100644 --- a/conf/machine/imx8mnevk.conf +++ b/conf/machine/imx8mnevk.conf | |||
@@ -44,6 +44,9 @@ DDR_FIRMWARE_NAME = "ddr4_imem_1d_201810.bin \ | |||
44 | # Set u-boot DTB | 44 | # Set u-boot DTB |
45 | UBOOT_DTB_NAME = "imx8mn-ddr4-evk.dtb" | 45 | UBOOT_DTB_NAME = "imx8mn-ddr4-evk.dtb" |
46 | 46 | ||
47 | # Set ATF platform name | ||
48 | ATF_PLATFORM = "imx8mn" | ||
49 | |||
47 | # Set imx-mkimage boot target | 50 | # Set imx-mkimage boot target |
48 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}" | 51 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}" |
49 | 52 | ||
diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mpevk.conf index f76240b6..9addae7d 100644 --- a/conf/machine/imx8mpevk.conf +++ b/conf/machine/imx8mpevk.conf | |||
@@ -51,6 +51,9 @@ DDR_FIRMWARE_NAME = " \ | |||
51 | # Set u-boot DTB | 51 | # Set u-boot DTB |
52 | UBOOT_DTB_NAME = "imx8mp-evk.dtb" | 52 | UBOOT_DTB_NAME = "imx8mp-evk.dtb" |
53 | 53 | ||
54 | # Set ATF platform name | ||
55 | ATF_PLATFORM = "imx8mp" | ||
56 | |||
54 | # Set imx-mkimage boot target | 57 | # Set imx-mkimage boot target |
55 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" | 58 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" |
56 | 59 | ||
diff --git a/recipes-bsp/imx-atf/imx-atf_2.2.bb b/recipes-bsp/imx-atf/imx-atf_2.2.bb index ca07dcad..e89822da 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.2.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.2.bb | |||
@@ -20,20 +20,17 @@ inherit deploy | |||
20 | 20 | ||
21 | BOOT_TOOLS = "imx-boot-tools" | 21 | BOOT_TOOLS = "imx-boot-tools" |
22 | 22 | ||
23 | PLATFORM ?= "INVALID" | 23 | ATF_PLATFORM ??= "INVALID" |
24 | PLATFORM_mx8qm = "imx8qm" | 24 | ATF_PLATFORM_mx8qm = "imx8qm" |
25 | PLATFORM_mx8x = "imx8qx" | 25 | ATF_PLATFORM_mx8x = "imx8qx" |
26 | PLATFORM_mx8mq = "imx8mq" | 26 | ATF_PLATFORM_mx8mq = "imx8mq" |
27 | PLATFORM_mx8mm = "imx8mm" | 27 | ATF_PLATFORM_mx8dx = "imx8dx" |
28 | PLATFORM_mx8mn = "imx8mn" | 28 | ATF_PLATFORM_imx8dxlevk = "imx8dxl" |
29 | PLATFORM_mx8mp = "imx8mp" | 29 | ATF_PLATFORM_mx8dxlevk-phantom = "imx8qx" |
30 | PLATFORM_mx8dx = "imx8dx" | ||
31 | PLATFORM_imx8dxlevk = "imx8dxl" | ||
32 | PLATFORM_mx8dxlevk-phantom = "imx8qx" | ||
33 | 30 | ||
34 | EXTRA_OEMAKE += " \ | 31 | EXTRA_OEMAKE += " \ |
35 | CROSS_COMPILE="${TARGET_PREFIX}" \ | 32 | CROSS_COMPILE="${TARGET_PREFIX}" \ |
36 | PLAT=${PLATFORM} \ | 33 | PLAT=${ATF_PLATFORM} \ |
37 | " | 34 | " |
38 | 35 | ||
39 | BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" | 36 | BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" |
@@ -51,12 +48,12 @@ do_compile() { | |||
51 | do_install[noexec] = "1" | 48 | do_install[noexec] = "1" |
52 | 49 | ||
53 | do_deploy() { | 50 | do_deploy() { |
54 | install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin | 51 | install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin |
55 | if ${BUILD_OPTEE}; then | 52 | if ${BUILD_OPTEE}; then |
56 | install -m 0644 ${S}/build-optee/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin-optee | 53 | install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin-optee |
57 | fi | 54 | fi |
58 | } | 55 | } |
59 | addtask deploy after do_compile | 56 | addtask deploy after do_compile |
60 | 57 | ||
61 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 58 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
62 | COMPATIBLE_MACHINE = "(mx8)" | 59 | COMPATIBLE_MACHINE = "(mx8|use-mainline-bsp)" |