summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/imx95-19x19-verdin.conf15
-rw-r--r--conf/machine/include/imx-base.inc44
-rw-r--r--conf/machine/include/qoriq-base.inc4
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:"
9require conf/machine/include/imx95-evk.inc 9require conf/machine/include/imx95-evk.inc
10IMX_DEFAULT_BSP = "nxp" 10IMX_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
16OEI_DDRCONFIG = "${@'XIMX95LPD5EVK19_6400mbps_train_timing_a1' if d.getVar('IMX_SOC_REV')[0] == 'A' else ''}"
17
12KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin" 18KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin"
13 19
14KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 20KERNEL_DEVICETREE:append:use-nxp-bsp = " \
@@ -53,11 +59,12 @@ IMXBOOT_TARGETS = "flash_a55"
53OEI_BOARD = "mx95lp5" 59OEI_BOARD = "mx95lp5"
54DDR_TYPE = "lpddr5" 60DDR_TYPE = "lpddr5"
55 61
62LPDDR_FW_VERSION = "_v202409"
56DDR_FIRMWARE_NAME = " \ 63DDR_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
63IMXBOOT_VARIANT = "" 70IMXBOOT_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)}"
187IMX_SOC_REV:mx93-generic-bsp ??= "A1" 187IMX_SOC_REV:mx93-generic-bsp ??= "A1"
188IMX_SOC_REV:mx95-generic-bsp ??= "B0"
188 189
189IMX_SOC_REV_LOWER = "${@d.getVar('IMX_SOC_REV').lower()}" 190IMX_SOC_REV_LOWER = "${@d.getVar('IMX_SOC_REV').lower()}"
190IMX_SOC_REV_UPPER = "${@d.getVar('IMX_SOC_REV').upper()}" 191IMX_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
507SECOEXT_FIRMWARE_NAME ?= "UNDEFINED" 508SECOEXT_FIRMWARE_NAME ?= ""
508SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img" 509SECOEXT_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}ext-ahab-container.img"
510SECOEXT_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
511MACHINE_GSTREAMER_1_0_PLUGIN ?= "" 513MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
@@ -527,25 +529,25 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin"
527MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" 529MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin"
528 530
529# GStreamer forked recipes 531# GStreamer forked recipes
530PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.0.imx" 532PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx"
531PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.0.imx" 533PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx"
532PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx" 534PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx"
533PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx" 535PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx"
534PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.0.imx" 536PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx"
535PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.0.imx" 537PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx"
536PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx" 538PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx"
537PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx" 539PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx"
538 540
539# GStreamer copied recipes 541# GStreamer copied recipes
540PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" 542PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.22.5.imx"
541PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.0.imx" 543PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx"
542PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" 544PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.7.imx"
543PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" 545PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx"
544PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" 546PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx"
545PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" 547PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx"
546PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" 548PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.22.5.imx"
547PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.0.imx" 549PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx"
548PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx" 550PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.7.imx"
549PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx" 551PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx"
550PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx" 552PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx"
551PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx" 553PREFERRED_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"
605PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx" 607PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
606 608
607# Use i.MX optee Version 609# Use i.MX optee Version
608PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.2.0.imx" 610PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.4.0.imx"
609PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.2.0.imx" 611PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.4.0.imx"
610PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.2.0.imx" 612PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx"
611PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.2.0.imx" 613PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx"
612PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.2.0.imx" 614PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.4.0.imx"
613PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.2.0.imx" 615PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.4.0.imx"
614 616
615# Use i.MX opencv Version 617# Use i.MX opencv Version
616PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" 618PREFERRED_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
44MACHINEOVERRIDES =. "qoriq:" 44MACHINEOVERRIDES =. "qoriq:"
45 45
46INHERIT += "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:"
51QORIQ_DEFAULT_BSP ?= "nxp" 53QORIQ_DEFAULT_BSP ?= "nxp"
52 54
53MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:" 55MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:"
56MACHINEOVERRIDES_EXTENDER:use-mainline-bsp = "qoriq-generic-bsp:qoriq-mainline-bsp"
57MACHINEOVERRIDES_EXTENDER:use-nxp-bsp = "qoriq-generic-bsp:qoriq-nxp-bsp"
54 58
55# Sub-architecture support 59# Sub-architecture support
56MACHINE_SOCARCH_SUFFIX ?= "" 60MACHINE_SOCARCH_SUFFIX ?= ""