diff options
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/imx95-19x19-verdin.conf | 15 | ||||
| -rw-r--r-- | conf/machine/include/imx-base.inc | 44 | ||||
| -rw-r--r-- | conf/machine/include/qoriq-base.inc | 4 |
3 files changed, 38 insertions, 25 deletions
diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf index d03d69139..2d8331956 100644 --- a/conf/machine/imx95-19x19-verdin.conf +++ b/conf/machine/imx95-19x19-verdin.conf | |||
| @@ -9,6 +9,12 @@ MACHINEOVERRIDES =. "mx95:" | |||
| 9 | require conf/machine/include/imx95-evk.inc | 9 | require conf/machine/include/imx95-evk.inc |
| 10 | IMX_DEFAULT_BSP = "nxp" | 10 | IMX_DEFAULT_BSP = "nxp" |
| 11 | 11 | ||
| 12 | # iMX95 Verdin EVK V1.1E is the first revision with a B0 SoC, | ||
| 13 | # older versions require A0/A1 support, set with the below variable | ||
| 14 | #IMX_SOC_REV:${MACHINE} = "A0" | ||
| 15 | # When building for A0/A1 iMX95 SoCs, set OEI_DDRCONFIG accordingly | ||
| 16 | OEI_DDRCONFIG = "${@'XIMX95LPD5EVK19_6400mbps_train_timing_a1' if d.getVar('IMX_SOC_REV')[0] == 'A' else ''}" | ||
| 17 | |||
| 12 | KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin" | 18 | KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin" |
| 13 | 19 | ||
| 14 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 20 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
| @@ -53,11 +59,12 @@ IMXBOOT_TARGETS = "flash_a55" | |||
| 53 | OEI_BOARD = "mx95lp5" | 59 | OEI_BOARD = "mx95lp5" |
| 54 | DDR_TYPE = "lpddr5" | 60 | DDR_TYPE = "lpddr5" |
| 55 | 61 | ||
| 62 | LPDDR_FW_VERSION = "_v202409" | ||
| 56 | DDR_FIRMWARE_NAME = " \ | 63 | DDR_FIRMWARE_NAME = " \ |
| 57 | lpddr5_dmem_v202311.bin \ | 64 | lpddr5_dmem${LPDDR_FW_VERSION}.bin \ |
| 58 | lpddr5_dmem_qb_v202311.bin \ | 65 | lpddr5_dmem_qb${LPDDR_FW_VERSION}.bin \ |
| 59 | lpddr5_imem_v202311.bin \ | 66 | lpddr5_imem${LPDDR_FW_VERSION}.bin \ |
| 60 | lpddr5_imem_qb_v202311.bin \ | 67 | lpddr5_imem_qb${LPDDR_FW_VERSION}.bin \ |
| 61 | " | 68 | " |
| 62 | 69 | ||
| 63 | IMXBOOT_VARIANT = "" | 70 | IMXBOOT_VARIANT = "" |
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 38afca6f8..e7a1ef8d4 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -185,6 +185,7 @@ IMX_SOC_REV:mx8ulp-generic-bsp ??= \ | |||
| 185 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \ | 185 | "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \ |
| 186 | 'A2', d)}" | 186 | 'A2', d)}" |
| 187 | IMX_SOC_REV:mx93-generic-bsp ??= "A1" | 187 | IMX_SOC_REV:mx93-generic-bsp ??= "A1" |
| 188 | IMX_SOC_REV:mx95-generic-bsp ??= "B0" | ||
| 188 | 189 | ||
| 189 | IMX_SOC_REV_LOWER = "${@d.getVar('IMX_SOC_REV').lower()}" | 190 | IMX_SOC_REV_LOWER = "${@d.getVar('IMX_SOC_REV').lower()}" |
| 190 | IMX_SOC_REV_UPPER = "${@d.getVar('IMX_SOC_REV').upper()}" | 191 | IMX_SOC_REV_UPPER = "${@d.getVar('IMX_SOC_REV').upper()}" |
| @@ -504,8 +505,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \ | |||
| 504 | " | 505 | " |
| 505 | 506 | ||
| 506 | # ELE extra Firmware | 507 | # ELE extra Firmware |
| 507 | SECOEXT_FIRMWARE_NAME ?= "UNDEFINED" | 508 | SECOEXT_FIRMWARE_NAME ?= "" |
| 508 | SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img" | 509 | SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img" |
| 510 | SECOEXT_FIRMWARE_NAME:mx95-generic-bsp ?= "mx95a0runtime-ahab-container.img mx95b0runtime-ahab-container.img" | ||
| 509 | 511 | ||
| 510 | # GStreamer 1.0 plugins | 512 | # GStreamer 1.0 plugins |
| 511 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" | 513 | MACHINE_GSTREAMER_1_0_PLUGIN ?= "" |
| @@ -527,25 +529,25 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" | |||
| 527 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" | 529 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" |
| 528 | 530 | ||
| 529 | # GStreamer forked recipes | 531 | # GStreamer forked recipes |
| 530 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.0.imx" | 532 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx" |
| 531 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.0.imx" | 533 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx" |
| 532 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx" | 534 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx" |
| 533 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx" | 535 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx" |
| 534 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.0.imx" | 536 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx" |
| 535 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.0.imx" | 537 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx" |
| 536 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx" | 538 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx" |
| 537 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx" | 539 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx" |
| 538 | 540 | ||
| 539 | # GStreamer copied recipes | 541 | # GStreamer copied recipes |
| 540 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" | 542 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.22.5.imx" |
| 541 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.0.imx" | 543 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx" |
| 542 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" | 544 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.7.imx" |
| 543 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" | 545 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" |
| 544 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" | 546 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" |
| 545 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" | 547 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" |
| 546 | PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" | 548 | PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.22.5.imx" |
| 547 | PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.0.imx" | 549 | PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx" |
| 548 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx" | 550 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.7.imx" |
| 549 | PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx" | 551 | PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx" |
| 550 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx" | 552 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx" |
| 551 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx" | 553 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx" |
| @@ -605,12 +607,12 @@ PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.275.0.imx" | |||
| 605 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx" | 607 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx" |
| 606 | 608 | ||
| 607 | # Use i.MX optee Version | 609 | # Use i.MX optee Version |
| 608 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.2.0.imx" | 610 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.4.0.imx" |
| 609 | PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.2.0.imx" | 611 | PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.4.0.imx" |
| 610 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.2.0.imx" | 612 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx" |
| 611 | PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.2.0.imx" | 613 | PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx" |
| 612 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.2.0.imx" | 614 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.4.0.imx" |
| 613 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.2.0.imx" | 615 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.4.0.imx" |
| 614 | 616 | ||
| 615 | # Use i.MX opencv Version | 617 | # Use i.MX opencv Version |
| 616 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" | 618 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" |
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 4340c9423..4a42a8bd3 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc | |||
| @@ -43,6 +43,8 @@ EXTRA_IMAGEDEPENDS += "u-boot qoriq-cst-native" | |||
| 43 | 43 | ||
| 44 | MACHINEOVERRIDES =. "qoriq:" | 44 | MACHINEOVERRIDES =. "qoriq:" |
| 45 | 45 | ||
| 46 | INHERIT += "machine-overrides-extender" | ||
| 47 | |||
| 46 | # Machines or distros can define which BSP it should use by default. We are | 48 | # Machines or distros can define which BSP it should use by default. We are |
| 47 | # intending to default for nxp BSP by default and specific machines or | 49 | # intending to default for nxp BSP by default and specific machines or |
| 48 | # DISTROs might change it if need. | 50 | # DISTROs might change it if need. |
| @@ -51,6 +53,8 @@ MACHINEOVERRIDES =. "qoriq:" | |||
| 51 | QORIQ_DEFAULT_BSP ?= "nxp" | 53 | QORIQ_DEFAULT_BSP ?= "nxp" |
| 52 | 54 | ||
| 53 | MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:" | 55 | MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:" |
| 56 | MACHINEOVERRIDES_EXTENDER:use-mainline-bsp = "qoriq-generic-bsp:qoriq-mainline-bsp" | ||
| 57 | MACHINEOVERRIDES_EXTENDER:use-nxp-bsp = "qoriq-generic-bsp:qoriq-nxp-bsp" | ||
| 54 | 58 | ||
| 55 | # Sub-architecture support | 59 | # Sub-architecture support |
| 56 | MACHINE_SOCARCH_SUFFIX ?= "" | 60 | MACHINE_SOCARCH_SUFFIX ?= "" |
