diff options
-rw-r--r-- | conf/machine/imx8mmevk.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx8mnevk.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx8mpevk.conf | 1 | ||||
-rw-r--r-- | recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 34 |
4 files changed, 17 insertions, 20 deletions
diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf index fcd78fb5..44e3781d 100644 --- a/conf/machine/imx8mmevk.conf +++ b/conf/machine/imx8mmevk.conf | |||
@@ -61,6 +61,7 @@ ATF_PLATFORM = "imx8mm" | |||
61 | 61 | ||
62 | # Set imx-mkimage boot target | 62 | # Set imx-mkimage boot target |
63 | 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)}" |
64 | IMX_BOOT_SOC_TARGET = "iMX8MM" | ||
64 | 65 | ||
65 | # Set Serial console | 66 | # Set Serial console |
66 | SERIAL_CONSOLES = "115200;ttymxc1" | 67 | SERIAL_CONSOLES = "115200;ttymxc1" |
diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf index fa0cb7b4..5d8f3001 100644 --- a/conf/machine/imx8mnevk.conf +++ b/conf/machine/imx8mnevk.conf | |||
@@ -49,6 +49,7 @@ ATF_PLATFORM = "imx8mn" | |||
49 | 49 | ||
50 | # Set imx-mkimage boot target | 50 | # Set imx-mkimage boot target |
51 | 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)}" |
52 | IMX_BOOT_SOC_TARGET = "iMX8MN" | ||
52 | 53 | ||
53 | # Set Serial console | 54 | # Set Serial console |
54 | SERIAL_CONSOLES = "115200;ttymxc1" | 55 | SERIAL_CONSOLES = "115200;ttymxc1" |
diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mpevk.conf index 9addae7d..1fbf0eef 100644 --- a/conf/machine/imx8mpevk.conf +++ b/conf/machine/imx8mpevk.conf | |||
@@ -56,6 +56,7 @@ ATF_PLATFORM = "imx8mp" | |||
56 | 56 | ||
57 | # Set imx-mkimage boot target | 57 | # Set imx-mkimage boot target |
58 | 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)}" |
59 | IMX_BOOT_SOC_TARGET = "iMX8MP" | ||
59 | 60 | ||
60 | # Set Serial console | 61 | # Set Serial console |
61 | SERIAL_CONSOLES = "115200;ttymxc1" | 62 | SERIAL_CONSOLES = "115200;ttymxc1" |
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index a54b439d..e73d3074 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb | |||
@@ -38,13 +38,10 @@ do_compile[depends] += " \ | |||
38 | 38 | ||
39 | SC_FIRMWARE_NAME ?= "scfw_tcm.bin" | 39 | SC_FIRMWARE_NAME ?= "scfw_tcm.bin" |
40 | 40 | ||
41 | ATF_MACHINE_NAME ?= "bl31-imx8qm.bin" | 41 | ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin" |
42 | ATF_MACHINE_NAME_mx8qm = "bl31-imx8qm.bin" | 42 | ATF_MACHINE_NAME_mx8qm = "bl31-imx8qm.bin" |
43 | ATF_MACHINE_NAME_mx8x = "bl31-imx8qx.bin" | 43 | ATF_MACHINE_NAME_mx8x = "bl31-imx8qx.bin" |
44 | ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin" | 44 | ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin" |
45 | ATF_MACHINE_NAME_mx8mm = "bl31-imx8mm.bin" | ||
46 | ATF_MACHINE_NAME_mx8mn = "bl31-imx8mn.bin" | ||
47 | ATF_MACHINE_NAME_mx8mp = "bl31-imx8mp.bin" | ||
48 | ATF_MACHINE_NAME_mx8phantomdxl = "bl31-imx8qx.bin" | 45 | ATF_MACHINE_NAME_mx8phantomdxl = "bl31-imx8qx.bin" |
49 | ATF_MACHINE_NAME_mx8dxl = "bl31-imx8dxl.bin" | 46 | ATF_MACHINE_NAME_mx8dxl = "bl31-imx8dxl.bin" |
50 | ATF_MACHINE_NAME_mx8dx = "bl31-imx8dx.bin" | 47 | ATF_MACHINE_NAME_mx8dx = "bl31-imx8dx.bin" |
@@ -55,16 +52,13 @@ BOOT_CONFIG_MACHINE = "${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG}.bin" | |||
55 | 52 | ||
56 | TOOLS_NAME ?= "mkimage_imx8" | 53 | TOOLS_NAME ?= "mkimage_imx8" |
57 | 54 | ||
58 | SOC_TARGET ?= "INVALID" | 55 | IMX_BOOT_SOC_TARGET ?= "INVALID" |
59 | SOC_TARGET_mx8qm = "iMX8QM" | 56 | IMX_BOOT_SOC_TARGET_mx8qm = "iMX8QM" |
60 | SOC_TARGET_mx8x = "iMX8QX" | 57 | IMX_BOOT_SOC_TARGET_mx8x = "iMX8QX" |
61 | SOC_TARGET_mx8mq = "iMX8M" | 58 | IMX_BOOT_SOC_TARGET_mx8mq = "iMX8M" |
62 | SOC_TARGET_mx8mm = "iMX8MM" | 59 | IMX_BOOT_SOC_TARGET_mx8dxl = "iMX8DXL" |
63 | SOC_TARGET_mx8mn = "iMX8MN" | 60 | IMX_BOOT_SOC_TARGET_mx8phantomdxl = "iMX8QX" |
64 | SOC_TARGET_mx8mp = "iMX8MP" | 61 | IMX_BOOT_SOC_TARGET_mx8dx = "iMX8DX" |
65 | SOC_TARGET_mx8dxl = "iMX8DXL" | ||
66 | SOC_TARGET_mx8phantomdxl = "iMX8QX" | ||
67 | SOC_TARGET_mx8dx = "iMX8DX" | ||
68 | 62 | ||
69 | DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" | 63 | DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" |
70 | 64 | ||
@@ -73,7 +67,7 @@ IMXBOOT_TARGETS ?= \ | |||
73 | bb.utils.contains('UBOOT_CONFIG', 'nand', 'flash_nand', \ | 67 | bb.utils.contains('UBOOT_CONFIG', 'nand', 'flash_nand', \ |
74 | 'flash_multi_cores flash_dcd', d), d)}" | 68 | 'flash_multi_cores flash_dcd', d), d)}" |
75 | 69 | ||
76 | BOOT_STAGING = "${S}/${SOC_TARGET}" | 70 | BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" |
77 | BOOT_STAGING_mx8m = "${S}/iMX8M" | 71 | BOOT_STAGING_mx8m = "${S}/iMX8M" |
78 | BOOT_STAGING_mx8dx = "${S}/iMX8QX" | 72 | BOOT_STAGING_mx8dx = "${S}/iMX8QX" |
79 | 73 | ||
@@ -135,11 +129,11 @@ do_compile() { | |||
135 | compile_${SOC_FAMILY} | 129 | compile_${SOC_FAMILY} |
136 | if [ "$target" = "flash_linux_m4_no_v2x" ]; then | 130 | if [ "$target" = "flash_linux_m4_no_v2x" ]; then |
137 | # Special target build for i.MX 8DXL with V2X off | 131 | # Special target build for i.MX 8DXL with V2X off |
138 | bbnote "building ${SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}" | 132 | bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}" |
139 | make SOC=${SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME} flash_linux_m4 | 133 | make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME} flash_linux_m4 |
140 | else | 134 | else |
141 | bbnote "building ${SOC_TARGET} - ${REV_OPTION} ${target}" | 135 | bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${target}" |
142 | make SOC=${SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME} ${target} | 136 | make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME} ${target} |
143 | fi | 137 | fi |
144 | if [ -e "${BOOT_STAGING}/flash.bin" ]; then | 138 | if [ -e "${BOOT_STAGING}/flash.bin" ]; then |
145 | cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${target} | 139 | cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${target} |
@@ -215,4 +209,4 @@ addtask deploy before do_build after do_compile | |||
215 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 209 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
216 | FILES_${PN} = "/boot" | 210 | FILES_${PN} = "/boot" |
217 | 211 | ||
218 | COMPATIBLE_MACHINE = "(mx8)" | 212 | COMPATIBLE_MACHINE = "(mx8|use-mainline-bsp)" |