diff options
Diffstat (limited to 'conf/machine')
39 files changed, 428 insertions, 111 deletions
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 1ab1d9df8..c65bc9b91 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf | |||
@@ -21,6 +21,7 @@ KERNEL_DEVICETREE = " \ | |||
21 | nxp/imx/imx6qp-sabresd.dtb \ | 21 | nxp/imx/imx6qp-sabresd.dtb \ |
22 | nxp/imx/imx6qp-sabresd-hdcp.dtb \ | 22 | nxp/imx/imx6qp-sabresd-hdcp.dtb \ |
23 | nxp/imx/imx6qp-sabresd-ldo.dtb \ | 23 | nxp/imx/imx6qp-sabresd-ldo.dtb \ |
24 | nxp/imx/imx6qp-sabresd-pcie-ep.dtb \ | ||
24 | \ | 25 | \ |
25 | nxp/imx/imx6q-sabresd-btwifi.dtb \ | 26 | nxp/imx/imx6q-sabresd-btwifi.dtb \ |
26 | nxp/imx/imx6q-sabresd.dtb \ | 27 | nxp/imx/imx6q-sabresd.dtb \ |
@@ -28,12 +29,16 @@ KERNEL_DEVICETREE = " \ | |||
28 | nxp/imx/imx6q-sabresd-hdcp.dtb \ | 29 | nxp/imx/imx6q-sabresd-hdcp.dtb \ |
29 | nxp/imx/imx6q-sabresd-ldo.dtb \ | 30 | nxp/imx/imx6q-sabresd-ldo.dtb \ |
30 | nxp/imx/imx6q-sabresd-uart.dtb \ | 31 | nxp/imx/imx6q-sabresd-uart.dtb \ |
32 | nxp/imx/imx6q-sabresd-pcie.dtb \ | ||
33 | nxp/imx/imx6q-sabresd-pcie-ep.dtb \ | ||
31 | \ | 34 | \ |
32 | nxp/imx/imx6dl-sabresd-btwifi.dtb \ | 35 | nxp/imx/imx6dl-sabresd-btwifi.dtb \ |
33 | nxp/imx/imx6dl-sabresd.dtb \ | 36 | nxp/imx/imx6dl-sabresd.dtb \ |
34 | nxp/imx/imx6dl-sabresd-enetirq.dtb \ | 37 | nxp/imx/imx6dl-sabresd-enetirq.dtb \ |
35 | nxp/imx/imx6dl-sabresd-hdcp.dtb \ | 38 | nxp/imx/imx6dl-sabresd-hdcp.dtb \ |
36 | nxp/imx/imx6dl-sabresd-ldo.dtb \ | 39 | nxp/imx/imx6dl-sabresd-ldo.dtb \ |
40 | nxp/imx/imx6dl-sabresd-pcie.dtb \ | ||
41 | nxp/imx/imx6dl-sabresd-pcie-ep.dtb \ | ||
37 | " | 42 | " |
38 | KERNEL_DEVICETREE:use-mainline-bsp = " \ | 43 | KERNEL_DEVICETREE:use-mainline-bsp = " \ |
39 | nxp/imx/imx6qp-sabresd.dtb \ | 44 | nxp/imx/imx6qp-sabresd.dtb \ |
@@ -76,6 +81,6 @@ OPTEE_BIN_EXT = "6qsdb" | |||
76 | 81 | ||
77 | SERIAL_CONSOLES = "115200;ttymxc0" | 82 | SERIAL_CONSOLES = "115200;ttymxc0" |
78 | 83 | ||
79 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" | 84 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k firmware-imx-epdc" |
80 | 85 | ||
81 | MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" | 86 | MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" |
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index af196eab8..df022d635 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf | |||
@@ -34,5 +34,6 @@ OPTEE_BIN_EXT = "6slevk" | |||
34 | SERIAL_CONSOLES = "115200;ttymxc0" | 34 | SERIAL_CONSOLES = "115200;ttymxc0" |
35 | 35 | ||
36 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" | 36 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
37 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
37 | 38 | ||
38 | MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" | 39 | MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" |
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 5a1dc666c..58fff6db0 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf | |||
@@ -30,9 +30,7 @@ OPTEE_BIN_EXT:imx6sllevk = "6sllevk" | |||
30 | SERIAL_CONSOLES = "115200;ttymxc0" | 30 | SERIAL_CONSOLES = "115200;ttymxc0" |
31 | 31 | ||
32 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" | 32 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
33 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
33 | 34 | ||
34 | # MESA DRI library | 35 | # MESA DRI library |
35 | XSERVER += "mesa-driver-swrast" | 36 | XSERVER += "mesa-driver-swrast" |
36 | |||
37 | PREFERRED_PROVIDER_u-boot = "u-boot-fslc" | ||
38 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fslc" | ||
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index 8d597c551..d85c7ce74 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf | |||
@@ -45,3 +45,4 @@ SERIAL_CONSOLES = "115200;ttymxc0" | |||
45 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" | 45 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" |
46 | 46 | ||
47 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" | 47 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
48 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 10c7b6fb4..3bab4f549 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf | |||
@@ -10,6 +10,7 @@ include conf/machine/include/imx-base.inc | |||
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
13 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
13 | 14 | ||
14 | KERNEL_DEVICETREE = " \ | 15 | KERNEL_DEVICETREE = " \ |
15 | nxp/imx/imx6ul-14x14-evk-btwifi.dtb \ | 16 | nxp/imx/imx6ul-14x14-evk-btwifi.dtb \ |
@@ -26,7 +27,11 @@ KERNEL_DEVICETREE = " \ | |||
26 | nxp/imx/imx6ul-14x14-evk-reve-ecspi-slave.dtb \ | 27 | nxp/imx/imx6ul-14x14-evk-reve-ecspi-slave.dtb \ |
27 | nxp/imx/imx6ul-14x14-evk-reve-emmc.dtb \ | 28 | nxp/imx/imx6ul-14x14-evk-reve-emmc.dtb \ |
28 | nxp/imx/imx6ul-14x14-evk-reve-gpmi-weim.dtb \ | 29 | nxp/imx/imx6ul-14x14-evk-reve-gpmi-weim.dtb \ |
30 | nxp/imx/imx6ul-9x9-evk.dtb \ | ||
31 | nxp/imx/imx6ul-9x9-evk-btwifi.dtb \ | ||
32 | nxp/imx/imx6ul-9x9-evk-ldo.dtb \ | ||
29 | " | 33 | " |
34 | |||
30 | KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6ul-14x14-evk.dtb" | 35 | KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6ul-14x14-evk.dtb" |
31 | 36 | ||
32 | ### u-boot-fslc settings ### | 37 | ### u-boot-fslc settings ### |
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index f412c18de..4c1184a79 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf | |||
@@ -9,13 +9,20 @@ MACHINEOVERRIDES =. "mx6ull:" | |||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FIRMWARE:append = " firmware-imx-epdc" | ||
13 | |||
12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio" | 14 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio" |
15 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
13 | 16 | ||
14 | KERNEL_DEVICETREE = " \ | 17 | KERNEL_DEVICETREE = " \ |
15 | nxp/imx/imx6ull-14x14-evk.dtb \ | 18 | nxp/imx/imx6ull-14x14-evk.dtb \ |
16 | " | 19 | " |
17 | 20 | ||
18 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 21 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
22 | nxp/imx/imx6ull-9x9-evk.dtb \ | ||
23 | nxp/imx/imx6ull-9x9-evk-btwifi.dtb \ | ||
24 | nxp/imx/imx6ull-9x9-evk-ldo.dtb \ | ||
25 | nxp/imx/imx6ull-14x14-evk.dtb \ | ||
19 | nxp/imx/imx6ull-14x14-evk-btwifi.dtb \ | 26 | nxp/imx/imx6ull-14x14-evk-btwifi.dtb \ |
20 | nxp/imx/imx6ull-14x14-evk-emmc.dtb \ | 27 | nxp/imx/imx6ull-14x14-evk-emmc.dtb \ |
21 | nxp/imx/imx6ull-14x14-evk-gpmi-weim.dtb \ | 28 | nxp/imx/imx6ull-14x14-evk-gpmi-weim.dtb \ |
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index c5fd91bf4..572434ae7 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf | |||
@@ -10,6 +10,7 @@ include conf/machine/include/imx-base.inc | |||
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
13 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
13 | 14 | ||
14 | KERNEL_DEVICETREE = " \ | 15 | KERNEL_DEVICETREE = " \ |
15 | nxp/imx/imx6ulz-14x14-evk.dtb \ | 16 | nxp/imx/imx6ulz-14x14-evk.dtb \ |
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 4b4a60122..96942ebb2 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf | |||
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc | |||
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" | 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
13 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
13 | 14 | ||
14 | KERNEL_DEVICETREE = "nxp/imx/imx7d-sdb.dtb" | 15 | KERNEL_DEVICETREE = "nxp/imx/imx7d-sdb.dtb" |
15 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 16 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
@@ -42,3 +43,10 @@ UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config" | |||
42 | OPTEE_BIN_EXT = "7dsdb" | 43 | OPTEE_BIN_EXT = "7dsdb" |
43 | 44 | ||
44 | XSERVER += "mesa-driver-swrast" | 45 | XSERVER += "mesa-driver-swrast" |
46 | |||
47 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos" | ||
48 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
49 | mcore-demos/imx7d_sabresd_m4_TCM_Pingpang.bin \ | ||
50 | mcore-demos/imx7d_sabresd_m4_TCM_helloworld.bin \ | ||
51 | mcore-demos/imx7d_sabresd_m4_TCM_mcctty.bin \ | ||
52 | " | ||
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index 2e39a0c79..b5196e30b 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf | |||
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc | |||
10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio" | 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio" |
13 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
13 | 14 | ||
14 | KERNEL_DEVICETREE = " \ | 15 | KERNEL_DEVICETREE = " \ |
15 | nxp/imx/imx7ulp-evk.dtb \ | 16 | nxp/imx/imx7ulp-evk.dtb \ |
@@ -43,3 +44,12 @@ OPTEE_BIN_EXT = "7ulp" | |||
43 | 44 | ||
44 | # Set Serial console | 45 | # Set Serial console |
45 | SERIAL_CONSOLES = "115200;ttyLP0" | 46 | SERIAL_CONSOLES = "115200;ttyLP0" |
47 | |||
48 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos" | ||
49 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
50 | mcore-demos/imx7ulp_m4_demo.img \ | ||
51 | mcore-demos/imx7ulp_wireless_uart_bridge.img \ | ||
52 | mcore-demos/imx7ulp_erpc_matrix_multiply_rpmsg_rtos_imxcm4.img \ | ||
53 | mcore-demos/imx7ulp_rpmsg_lite_pingpong_rtos.img \ | ||
54 | mcore-demos/imx7ulp_rpmsg_lite_str_echo_rtos.img \ | ||
55 | " | ||
diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf index de00b6f65..7d87010b4 100644 --- a/conf/machine/imx8mnul-ddr3l-evk.conf +++ b/conf/machine/imx8mnul-ddr3l-evk.conf | |||
@@ -14,7 +14,7 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" | |||
14 | # NXP BSP can consume proprietary jailhouse and Broadcom drivers | 14 | # NXP BSP can consume proprietary jailhouse and Broadcom drivers |
15 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have | 15 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have |
16 | # a full support for it yet. | 16 | # a full support for it yet. |
17 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" | 17 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 nxpwifi-all-sdio" |
18 | 18 | ||
19 | KERNEL_DEVICETREE_BASENAME = "imx8mn-ddr3l-evk" | 19 | KERNEL_DEVICETREE_BASENAME = "imx8mn-ddr3l-evk" |
20 | KERNEL_DEVICETREE = " \ | 20 | KERNEL_DEVICETREE = " \ |
@@ -67,3 +67,11 @@ UBOOT_MAKE_TARGET:pn-u-boot-imx = "" | |||
67 | IMX_BOOT_SEEK = "32" | 67 | IMX_BOOT_SEEK = "32" |
68 | 68 | ||
69 | OPTEE_BIN_EXT = "8mnul" | 69 | OPTEE_BIN_EXT = "8mnul" |
70 | |||
71 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos" | ||
72 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
73 | mcore-demos/imx8mnddr3l_m7_TCM_hello_world.bin \ | ||
74 | mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
75 | mcore-demos/imx8mnddr3l_m7_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
76 | mcore-demos/imx8mnddr3l_m7_TCM_sai_low_power_audio.bin \ | ||
77 | " | ||
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf index 39108716a..cc461a1aa 100644 --- a/conf/machine/imx8mp-lpddr4-evk.conf +++ b/conf/machine/imx8mp-lpddr4-evk.conf | |||
@@ -41,6 +41,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
41 | freescale/imx8mp-evk-root.dtb \ | 41 | freescale/imx8mp-evk-root.dtb \ |
42 | freescale/imx8mp-evk-rpmsg.dtb \ | 42 | freescale/imx8mp-evk-rpmsg.dtb \ |
43 | freescale/imx8mp-evk-rpmsg-lpv.dtb \ | 43 | freescale/imx8mp-evk-rpmsg-lpv.dtb \ |
44 | freescale/imx8mp-evk-sof-pdm.dtb \ | ||
44 | freescale/imx8mp-evk-sof-wm8960.dtb \ | 45 | freescale/imx8mp-evk-sof-wm8960.dtb \ |
45 | freescale/imx8mp-evk-spdif-lb.dtb \ | 46 | freescale/imx8mp-evk-spdif-lb.dtb \ |
46 | freescale/imx8mp-evk-usdhc1-m2.dtb \ | 47 | freescale/imx8mp-evk-usdhc1-m2.dtb \ |
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index 92a436e54..ff56e386d 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf | |||
@@ -15,7 +15,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc | |||
15 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" | 15 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" |
16 | 16 | ||
17 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio" | 17 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio" |
18 | MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359" | 18 | MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359 jailhouse nxpwifi-all-pcie nxpwifi-all-sdio" |
19 | 19 | ||
20 | MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" | 20 | MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" |
21 | 21 | ||
@@ -98,3 +98,10 @@ OPTEE_BIN_EXT = "8mq" | |||
98 | 98 | ||
99 | # Add additional firmware | 99 | # Add additional firmware |
100 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" | 100 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" |
101 | |||
102 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos" | ||
103 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
104 | mcore-demos/imx8mq_m4_TCM_hello_world.bin \ | ||
105 | mcore-demos/imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
106 | mcore-demos/imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
107 | " | ||
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index 47cfde198..56ede4326 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf | |||
@@ -12,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc | |||
12 | IMX_DEFAULT_BSP = "nxp" | 12 | IMX_DEFAULT_BSP = "nxp" |
13 | 13 | ||
14 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" | 14 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" |
15 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" | 15 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio" |
16 | 16 | ||
17 | # Don't include kernels in standard images | 17 | # Don't include kernels in standard images |
18 | RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" | 18 | RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" |
@@ -20,7 +20,7 @@ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" | |||
20 | LOADADDR = "" | 20 | LOADADDR = "" |
21 | 21 | ||
22 | # We have to disable SERIAL_CONSOLE due to auto-serial-console | 22 | # We have to disable SERIAL_CONSOLE due to auto-serial-console |
23 | SERIAL_CONSOLES = "115200;ttyAMA0" | 23 | SERIAL_CONSOLES = "115200;ttyLP0" |
24 | 24 | ||
25 | # we do not want to have getty running on tty1 as we run | 25 | # we do not want to have getty running on tty1 as we run |
26 | # auto-serial-console there | 26 | # auto-serial-console there |
@@ -42,7 +42,6 @@ KERNEL_DEVICETREE = " \ | |||
42 | freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \ | 42 | freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \ |
43 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ | 43 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ |
44 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ | 44 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ |
45 | freescale/imx8qm-mek-ov5640.dtb \ | ||
46 | freescale/imx8qm-mek-pcie-ep.dtb \ | 45 | freescale/imx8qm-mek-pcie-ep.dtb \ |
47 | freescale/imx8qm-mek-rpmsg.dtb \ | 46 | freescale/imx8qm-mek-rpmsg.dtb \ |
48 | freescale/imx8qm-mek-sof.dtb \ | 47 | freescale/imx8qm-mek-sof.dtb \ |
@@ -50,6 +49,37 @@ KERNEL_DEVICETREE = " \ | |||
50 | freescale/imx8qm-mek-sof-wm8960.dtb \ | 49 | freescale/imx8qm-mek-sof-wm8960.dtb \ |
51 | freescale/imx8qm-mek-usd-wifi.dtb \ | 50 | freescale/imx8qm-mek-usd-wifi.dtb \ |
52 | freescale/imx8qm-mek-usdhc3-m2.dtb \ | 51 | freescale/imx8qm-mek-usdhc3-m2.dtb \ |
52 | freescale/imx8qm-mek-max9286-csi0.dtb \ | ||
53 | freescale/imx8qm-mek-max9286-csi1.dtb \ | ||
54 | freescale/imx8qm-mek-max9286-dual.dtb \ | ||
55 | freescale/imx8qm-mek-revd-ca53.dtb \ | ||
56 | freescale/imx8qm-mek-revd-ca72.dtb \ | ||
57 | freescale/imx8qm-mek-revd-dsi-rm67191.dtb \ | ||
58 | freescale/imx8qm-mek-revd-dsi-rm67199.dtb \ | ||
59 | freescale/imx8qm-mek-revd.dtb \ | ||
60 | freescale/imx8qm-mek-revd-enet2-tja1100.dtb \ | ||
61 | freescale/imx8qm-mek-revd-hdmi.dtb \ | ||
62 | freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \ | ||
63 | freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \ | ||
64 | freescale/imx8qm-mek-revd-max9286-csi0.dtb \ | ||
65 | freescale/imx8qm-mek-revd-max9286-csi1.dtb \ | ||
66 | freescale/imx8qm-mek-revd-max9286-dual.dtb \ | ||
67 | freescale/imx8qm-mek-revd-ov5640-csi0.dtb \ | ||
68 | freescale/imx8qm-mek-revd-ov5640-csi1.dtb \ | ||
69 | freescale/imx8qm-mek-revd-ov5640-dual.dtb \ | ||
70 | freescale/imx8qm-mek-revd-pcie-ep.dtb \ | ||
71 | freescale/imx8qm-mek-revd-root.dtb \ | ||
72 | freescale/imx8qm-mek-revd-rpmsg.dtb \ | ||
73 | freescale/imx8qm-mek-revd-sof-cs42888.dtb \ | ||
74 | freescale/imx8qm-mek-revd-sof-wm8962.dtb \ | ||
75 | freescale/imx8qm-mek-revd-usdhc3-m2.dtb \ | ||
76 | freescale/imx8qm-mek-revd-usd-wifi.dtb \ | ||
77 | freescale/imx8qm-mek-ov5640-csi0.dtb \ | ||
78 | freescale/imx8qm-mek-ov5640-csi0-rpmsg.dtb \ | ||
79 | freescale/imx8qm-mek-ov5640-csi1.dtb \ | ||
80 | freescale/imx8qm-mek-ov5640-csi1-rpmsg.dtb \ | ||
81 | freescale/imx8qm-mek-ov5640-dual.dtb \ | ||
82 | freescale/imx8qm-mek-ov5640-dual-rpmsg.dtb \ | ||
53 | " | 83 | " |
54 | 84 | ||
55 | UBOOT_MAKE_TARGET = \ | 85 | UBOOT_MAKE_TARGET = \ |
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf index 87df30f42..6763c985e 100644 --- a/conf/machine/imx8qxp-mek.conf +++ b/conf/machine/imx8qxp-mek.conf | |||
@@ -25,6 +25,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
25 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ | 25 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ |
26 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ | 26 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ |
27 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8962.dtb \ | 27 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8962.dtb \ |
28 | freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \ | ||
29 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \ | ||
30 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \ | ||
31 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \ | ||
32 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \ | ||
33 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \ | ||
34 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \ | ||
28 | " | 35 | " |
29 | 36 | ||
30 | UBOOT_CONFIG_BASENAME = "imx8qxp_mek" | 37 | UBOOT_CONFIG_BASENAME = "imx8qxp_mek" |
diff --git a/conf/machine/imx8ulp-lpddr4-evk.conf b/conf/machine/imx8ulp-lpddr4-evk.conf index 273e1569d..ad8362e64 100644 --- a/conf/machine/imx8ulp-lpddr4-evk.conf +++ b/conf/machine/imx8ulp-lpddr4-evk.conf | |||
@@ -18,10 +18,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
18 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \ | 18 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \ |
19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \ | 19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \ |
20 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \ | 20 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \ |
21 | freescale/${KERNEL_DEVICETREE_BASENAME}-tpm.dtb \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | UBOOT_CONFIG_BASENAME = "imx8ulp_evk" | 24 | UBOOT_CONFIG_BASENAME = "imx8ulp_evk" |
24 | 25 | ||
25 | MACHINE_FEATURES += "soc-reva1" | 26 | MACHINE_FEATURES += "soc-reva2" |
27 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
28 | |||
26 | UPOWER_FIRMWARE_NAME = "upower_a1.bin" | 29 | UPOWER_FIRMWARE_NAME = "upower_a1.bin" |
27 | IMX_DEFAULT_BSP = "nxp" | 30 | IMX_DEFAULT_BSP = "nxp" |
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf index f8bdc4d7f..e7ad6d4d3 100644 --- a/conf/machine/imx93-11x11-lpddr4x-evk.conf +++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf | |||
@@ -13,11 +13,11 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
13 | freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \ | 13 | freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \ |
14 | freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \ | 14 | freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \ |
15 | freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ | 15 | freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ |
16 | freescale/${KERNEL_DEVICETREE_BASENAME}-i2c-spi-slave.dtb \ | ||
16 | freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ | 17 | freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ |
17 | freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ | 18 | freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ |
19 | freescale/${KERNEL_DEVICETREE_BASENAME}-iw612-otbr.dtb \ | ||
18 | freescale/${KERNEL_DEVICETREE_BASENAME}-ld.dtb \ | 20 | freescale/${KERNEL_DEVICETREE_BASENAME}-ld.dtb \ |
19 | freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \ | ||
20 | freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \ | ||
21 | freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \ | 21 | freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \ |
22 | freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \ | 22 | freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \ |
23 | freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \ | 23 | freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \ |
@@ -35,3 +35,13 @@ DDR_FIRMWARE_NAME = " \ | |||
35 | lpddr4_imem_1d_v202201.bin \ | 35 | lpddr4_imem_1d_v202201.bin \ |
36 | lpddr4_imem_2d_v202201.bin \ | 36 | lpddr4_imem_2d_v202201.bin \ |
37 | " | 37 | " |
38 | |||
39 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos" | ||
40 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
41 | mcore-demos/imx93-11x11-evk_m33_TCM_low_power_wakeword.bin \ | ||
42 | mcore-demos/imx93-11x11-evk_m33_TCM_power_mode_switch.bin \ | ||
43 | mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
44 | mcore-demos/imx93-11x11-evk_m33_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
45 | mcore-demos/imx93-11x11-evk_m33_TCM_sai_low_power_audio.bin \ | ||
46 | " | ||
47 | |||
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf index 975591042..dff843a79 100644 --- a/conf/machine/imx93-14x14-lpddr4x-evk.conf +++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf | |||
@@ -13,13 +13,14 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
13 | freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-serdes.dtb \ | 13 | freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-serdes.dtb \ |
14 | freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ | 14 | freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ |
15 | freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ | 15 | freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ |
16 | freescale/${KERNEL_DEVICETREE_BASENAME}-lvds-it6263.dtb \ | ||
17 | freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \ | ||
16 | freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ | 18 | freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ |
17 | freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \ | 19 | freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \ |
18 | freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \ | 20 | freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \ |
19 | " | 21 | " |
20 | 22 | ||
21 | UBOOT_CONFIG_BASENAME = "imx93_14x14_evk" | 23 | UBOOT_CONFIG_BASENAME = "imx93_14x14_evk" |
22 | IMXBOOT_TARGETS_BASENAME = "flash_singleboot" | ||
23 | 24 | ||
24 | DDR_FIRMWARE_NAME = " \ | 25 | DDR_FIRMWARE_NAME = " \ |
25 | lpddr4_dmem_1d_v202201.bin \ | 26 | lpddr4_dmem_1d_v202201.bin \ |
@@ -28,6 +29,9 @@ DDR_FIRMWARE_NAME = " \ | |||
28 | lpddr4_imem_2d_v202201.bin \ | 29 | lpddr4_imem_2d_v202201.bin \ |
29 | " | 30 | " |
30 | 31 | ||
31 | UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" | 32 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos" |
32 | 33 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | |
33 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" | 34 | mcore-demos/imx93-14x14-evk_m33_TCM_power_mode_switch.bin \ |
35 | mcore-demos/imx93-14x14-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
36 | mcore-demos/imx93-14x14-evk_m33_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
37 | " | ||
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf index 3ccd6fd77..ef53da5eb 100644 --- a/conf/machine/imx93-9x9-lpddr4-qsb.conf +++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf | |||
@@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
18 | freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \ | 18 | freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \ |
19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ | 19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ |
20 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \ | 20 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \ |
21 | freescale/${KERNEL_DEVICETREE_BASENAME}-tianma-wvga-panel.dtb \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb" | 24 | UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb" |
@@ -28,3 +29,12 @@ DDR_FIRMWARE_NAME = " \ | |||
28 | lpddr4_imem_1d_v202201.bin \ | 29 | lpddr4_imem_1d_v202201.bin \ |
29 | lpddr4_imem_2d_v202201.bin \ | 30 | lpddr4_imem_2d_v202201.bin \ |
30 | " | 31 | " |
32 | |||
33 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos" | ||
34 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
35 | mcore-demos/imx93-9x9-qsb_m33_TCM_power_mode_switch.bin \ | ||
36 | mcore-demos/imx93-9x9-qsb_m33_TCM_low_power_wakeword.bin \ | ||
37 | mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
38 | mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
39 | mcore-demos/imx93-9x9-qsb_m33_TCM_sai_low_power_audio.bin \ | ||
40 | " | ||
diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf new file mode 100644 index 000000000..38acc47da --- /dev/null +++ b/conf/machine/imx95-19x19-verdin.conf | |||
@@ -0,0 +1,90 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: Toradex i.MX 95 19x19 Verdin Evaluation Kit | ||
3 | #@SOC: i.MX95 | ||
4 | #@DESCRIPTION: Machine configuration for Toradex i.MX 95 19x19 Verdin Evaluation Ki | ||
5 | #@MAINTAINER: Flora Hu <flora.hu@nxp.com> | ||
6 | |||
7 | MACHINEOVERRIDES =. "mx95:" | ||
8 | |||
9 | require conf/machine/include/imx95-evk.inc | ||
10 | |||
11 | KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin" | ||
12 | |||
13 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | ||
14 | freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtb \ | ||
15 | freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535.dtbo \ | ||
16 | freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535-ap1302.dtb \ | ||
17 | freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtb \ | ||
18 | freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtbo \ | ||
19 | freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ | ||
20 | freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtb \ | ||
21 | freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtbo \ | ||
22 | freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912-ap1302.dtb \ | ||
23 | freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtb \ | ||
24 | freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc.dtbo \ | ||
25 | freescale/${KERNEL_DEVICETREE_BASENAME}-lt9611uxc-ap1302.dtb \ | ||
26 | freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtb \ | ||
27 | freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20.dtbo \ | ||
28 | freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-combo.dtb \ | ||
29 | freescale/${KERNEL_DEVICETREE_BASENAME}-os08a20-isp-lt8912.dtb \ | ||
30 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtb \ | ||
31 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10.dtbo \ | ||
32 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox03c10-isp-lt8912.dtb \ | ||
33 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtb \ | ||
34 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s.dtbo \ | ||
35 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-combo.dtb \ | ||
36 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-isp-lt8912.dtb \ | ||
37 | freescale/${KERNEL_DEVICETREE_BASENAME}-ox05b1s-isp-lvds-dual.dtb \ | ||
38 | freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtb \ | ||
39 | freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-dsi.dtbo \ | ||
40 | freescale/${KERNEL_DEVICETREE_BASENAME}-panel-cap-touch-10inch-lvds.dtb \ | ||
41 | freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \ | ||
42 | freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtbo \ | ||
43 | freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ | ||
44 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ | ||
45 | freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtb \ | ||
46 | freescale/${KERNEL_DEVICETREE_BASENAME}-ti-serdes.dtbo \ | ||
47 | " | ||
48 | |||
49 | UBOOT_CONFIG_BASENAME = "imx95_19x19_verdin" | ||
50 | |||
51 | UBOOT_CONFIG ??= "sd" | ||
52 | UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig" | ||
53 | UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" | ||
54 | |||
55 | IMXBOOT_TARGETS = "flash_a55" | ||
56 | |||
57 | IMXBOOT_TARGETS_BASENAME = "flash" | ||
58 | OEI_BOARD = "mx95lp5" | ||
59 | DDR_TYPE = "lpddr5" | ||
60 | |||
61 | LPDDR_FW_VERSION = "_v202409" | ||
62 | DDR_FIRMWARE_NAME = " \ | ||
63 | lpddr5_dmem${LPDDR_FW_VERSION}.bin \ | ||
64 | lpddr5_dmem_qb${LPDDR_FW_VERSION}.bin \ | ||
65 | lpddr5_imem${LPDDR_FW_VERSION}.bin \ | ||
66 | lpddr5_imem_qb${LPDDR_FW_VERSION}.bin \ | ||
67 | " | ||
68 | |||
69 | IMXBOOT_VARIANT = "" | ||
70 | M4_DEFAULT_IMAGE_MX95:imx-nxp-bsp = "imx95-verdin-evk_m7_TCM_power_mode_switch.bin" | ||
71 | |||
72 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos" | ||
73 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
74 | mcore-demos/imx95-verdin-evk_m7_TCM_power_mode_switch.bin \ | ||
75 | mcore-demos/imx95-verdin-evk_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
76 | mcore-demos/imx95-verdin-evk_m7_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
77 | mcore-demos/imx95-verdin-evk_m7_TCM_sai_low_power_audio.bin \ | ||
78 | ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \ | ||
79 | " | ||
80 | |||
81 | #IMXBOOT_VARIANT = "" | ||
82 | |||
83 | # The System Manager Firmware Name corresponds to a particular binary implementation | ||
84 | # in the Yocto deploy folder. The name is comprised of the Firmware Basename and the | ||
85 | # default system manager Config name, e.g., m33_image-mx95evk.bin and | ||
86 | # m33_image-mx95evk_fusa.bin for the standard BSP version and FuSa version, respectively | ||
87 | # The System Manager Firmware Basename is an alias used by imx-boot instead of using | ||
88 | # a unique name for each implementation, e.g., m33_image.bin for i.MX 95 | ||
89 | SYSTEM_MANAGER_FIRMWARE_BASENAME ?= "m33_image" | ||
90 | SYSTEM_MANAGER_FIRMWARE_NAME ?= "m33_image-mx95evk" | ||
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b127cee45..15d7b2e8d 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -75,9 +75,9 @@ UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}" | |||
75 | # wic based images. | 75 | # wic based images. |
76 | SPL_BINARY ??= "${@get_spl_binary(d)}" | 76 | SPL_BINARY ??= "${@get_spl_binary(d)}" |
77 | 77 | ||
78 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" | ||
79 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}" | ||
80 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" | 78 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" |
79 | PREFERRED_PROVIDER_u-boot ??= "${PREFERRED_PROVIDER_virtual/bootloader}" | ||
80 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${PREFERRED_PROVIDER_virtual/bootloader}" | ||
81 | 81 | ||
82 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" | 82 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" |
83 | 83 | ||
@@ -94,6 +94,7 @@ UBOOT_ENTRYPOINT:mx6ulz-generic-bsp ?= "0x80008000" | |||
94 | UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000" | 94 | UBOOT_ENTRYPOINT:mx7-generic-bsp ?= "0x80008000" |
95 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" | 95 | UBOOT_ENTRYPOINT:mx7ulp-generic-bsp ?= "0x60008000" |
96 | UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" | 96 | UBOOT_ENTRYPOINT:mx8m-generic-bsp ?= "0x40480000" |
97 | UBOOT_ENTRYPOINT:mx93-generic-bsp ?= "0x80400000" | ||
97 | UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" | 98 | UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" |
98 | 99 | ||
99 | # Some SoC can utilize the boot container provided by U-Boot, | 100 | # Some SoC can utilize the boot container provided by U-Boot, |
@@ -129,6 +130,7 @@ IMX_DEFAULT_ATF_PROVIDER ??= "imx-atf" | |||
129 | SOC_ATF_BOOT_UART_BASE = "" | 130 | SOC_ATF_BOOT_UART_BASE = "" |
130 | 131 | ||
131 | SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000" | 132 | SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000" |
133 | SOC_ATF_BOOT_UART_BASE:mx8mq-generic-bsp = "0x30860000" | ||
132 | ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}" | 134 | ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}" |
133 | 135 | ||
134 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 136 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
@@ -165,7 +167,9 @@ DEFAULTTUNE:mx8m-generic-bsp ?= "cortexa53-crypto" | |||
165 | DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" | 167 | DEFAULTTUNE:mx8qm-generic-bsp ?= "cortexa72-cortexa53-crypto" |
166 | DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto" | 168 | DEFAULTTUNE:mx8x-generic-bsp ?= "cortexa35-crypto" |
167 | DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" | 169 | DEFAULTTUNE:mx8ulp-generic-bsp ?= "cortexa35-crypto" |
170 | DEFAULTTUNE:mx91-generic-bsp ?= "cortexa55" | ||
168 | DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" | 171 | DEFAULTTUNE:mx93-generic-bsp ?= "cortexa55" |
172 | DEFAULTTUNE:mx95-generic-bsp ?= "cortexa55" | ||
169 | 173 | ||
170 | INHERIT += "machine-overrides-extender" | 174 | INHERIT += "machine-overrides-extender" |
171 | 175 | ||
@@ -189,12 +193,12 @@ IMX_SOC_REV_UPPER = "${@d.getVar('IMX_SOC_REV').upper()}" | |||
189 | ### NXP BSP specific overrides | 193 | ### NXP BSP specific overrides |
190 | ####### | 194 | ####### |
191 | 195 | ||
192 | MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp" | 196 | MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp" |
193 | MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp" | 197 | MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp" |
194 | 198 | ||
195 | MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp" | 199 | MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp" |
196 | 200 | ||
197 | MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp" | 201 | MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp" |
198 | MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp" | 202 | MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp" |
199 | 203 | ||
200 | MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp" | 204 | MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp" |
@@ -202,25 +206,27 @@ MACHINEOVERRIDES_EXTENDER:mx6ull:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxf | |||
202 | MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp" | 206 | MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp" |
203 | 207 | ||
204 | MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp" | 208 | MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp" |
205 | MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp" | 209 | MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp" |
206 | 210 | ||
207 | MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp" | 211 | MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp" |
208 | 212 | ||
209 | MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp" | 213 | MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp" |
210 | 214 | ||
211 | MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp" | 215 | MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp" |
212 | MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp" | 216 | MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp" |
213 | MACHINEOVERRIDES_EXTENDER:mx8mnul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mnul-generic-bsp:mx8mnul-nxp-bsp" | 217 | MACHINEOVERRIDES_EXTENDER:mx8mnul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mnul-generic-bsp:mx8mnul-nxp-bsp" |
214 | MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp" | 218 | MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp" |
215 | MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp" | 219 | MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp" |
216 | 220 | ||
217 | 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" | 221 | MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp" |
218 | 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" | 222 | MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp" |
219 | 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" | 223 | 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" |
220 | 224 | ||
221 | 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" | 225 | MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp" |
222 | 226 | ||
227 | MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp" | ||
223 | MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp" | 228 | MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp" |
229 | MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp" | ||
224 | 230 | ||
225 | ####### | 231 | ####### |
226 | ### Mainline BSP specific overrides | 232 | ### Mainline BSP specific overrides |
@@ -263,7 +269,9 @@ MACHINEOVERRIDES_EXTENDER:mx8dxl:use-mainline-bsp = "imx-generic-bsp:imx-mainlin | |||
263 | 269 | ||
264 | MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-mainline-bsp" | 270 | MACHINEOVERRIDES_EXTENDER:mx8ulp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8ulp-generic-bsp:mx8ulp-mainline-bsp" |
265 | 271 | ||
272 | MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp" | ||
266 | MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" | 273 | MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp" |
274 | MACHINEOVERRIDES_EXTENDER:mx95:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx95-generic-bsp:mx95-mainline-bsp" | ||
267 | 275 | ||
268 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ | 276 | MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ |
269 | mx6 \ | 277 | mx6 \ |
@@ -294,7 +302,9 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \ | |||
294 | mx8dx \ | 302 | mx8dx \ |
295 | mx8dxl \ | 303 | mx8dxl \ |
296 | mx8ulp \ | 304 | mx8ulp \ |
305 | mx91 \ | ||
297 | mx93 \ | 306 | mx93 \ |
307 | mx95 \ | ||
298 | " | 308 | " |
299 | 309 | ||
300 | MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR = "%s overrides cannot be used and need conversion to use the new BSP-specific overrides. Check 'meta-freescale/scripts/convert-bsp-specific-overrides'." | 310 | MACHINEOVERRIDES_FILTERED_OUT_QA_ERROR = "%s overrides cannot be used and need conversion to use the new BSP-specific overrides. Check 'meta-freescale/scripts/convert-bsp-specific-overrides'." |
@@ -305,7 +315,7 @@ MACHINE_SOCARCH_SUFFIX:mx6q-nxp-bsp = "-mx6qdl" | |||
305 | MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" | 315 | MACHINE_SOCARCH_SUFFIX:mx6dl-nxp-bsp = "-mx6qdl" |
306 | MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" | 316 | MACHINE_SOCARCH_SUFFIX:mx6sx-nxp-bsp = "-mx6sx" |
307 | MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" | 317 | MACHINE_SOCARCH_SUFFIX:mx6sl-nxp-bsp = "-mx6sl" |
308 | MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp= "-mx6sll" | 318 | MACHINE_SOCARCH_SUFFIX:mx6sll-nxp-bsp = "-mx6sll" |
309 | MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" | 319 | MACHINE_SOCARCH_SUFFIX:mx7d-nxp-bsp = "-mx7d" |
310 | MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" | 320 | MACHINE_SOCARCH_SUFFIX:mx7ulp-nxp-bsp = "-mx7ulp" |
311 | MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf" | 321 | MACHINE_SOCARCH_SUFFIX:vf-nxp-bsp = "-vf" |
@@ -322,7 +332,9 @@ MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8" | |||
322 | MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" | 332 | MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp = "-mx8" |
323 | MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" | 333 | MACHINE_SOCARCH_SUFFIX:mx8dxl-nxp-bsp = "-mx8xl" |
324 | MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" | 334 | MACHINE_SOCARCH_SUFFIX:mx8ulp-nxp-bsp = "-mx8ulp" |
335 | MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp = "-mx91" | ||
325 | MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" | 336 | MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93" |
337 | MACHINE_SOCARCH_SUFFIX:mx95-nxp-bsp = "-mx95" | ||
326 | 338 | ||
327 | # For Mainline we use a single SoC suffix as we don't have different build options | 339 | # For Mainline we use a single SoC suffix as we don't have different build options |
328 | MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" | 340 | MACHINE_SOCARCH_SUFFIX:imx-mainline-bsp = "-imx" |
@@ -399,7 +411,11 @@ IMX_EXTRA_FIRMWARE:mx8-generic-bsp = "imx-boot-firmware-files imx-sc-firmware | |||
399 | IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "imx-boot-firmware-files" | 411 | IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "imx-boot-firmware-files" |
400 | IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" | 412 | IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" |
401 | IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx" | 413 | IMX_EXTRA_FIRMWARE:mx8ulp-generic-bsp = "firmware-upower firmware-ele-imx" |
414 | IMX_EXTRA_FIRMWARE:mx91-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" | ||
402 | IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" | 415 | IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "imx-boot-firmware-files firmware-ele-imx" |
416 | PREFERRED_PROVIDER_virtual/imx-system-manager ??= "imx-system-manager" | ||
417 | PREFERRED_PROVIDER_virtual/imx-oei ??= "imx-oei" | ||
418 | IMX_EXTRA_FIRMWARE:mx95-generic-bsp = "imx-boot-firmware-files firmware-ele-imx virtual/imx-system-manager virtual/imx-oei" | ||
403 | 419 | ||
404 | # Firmware | 420 | # Firmware |
405 | MACHINE_FIRMWARE ?= "" | 421 | MACHINE_FIRMWARE ?= "" |
@@ -420,6 +436,7 @@ MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d f | |||
420 | MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" | 436 | MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" |
421 | MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" | 437 | MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" |
422 | MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" | 438 | MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" |
439 | MACHINE_FIRMWARE:append:mx95-generic-bsp = " firmware-imx-vpu-wave" | ||
423 | MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" | 440 | MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" |
424 | 441 | ||
425 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" | 442 | MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" |
@@ -510,24 +527,26 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" | |||
510 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" | 527 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" |
511 | 528 | ||
512 | # GStreamer forked recipes | 529 | # GStreamer forked recipes |
513 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.0.imx" | 530 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx" |
514 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.0.imx" | 531 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx" |
515 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx" | 532 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx" |
516 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx" | 533 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx" |
517 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.0.imx" | 534 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx" |
518 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.0.imx" | 535 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx" |
519 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx" | 536 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx" |
520 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx" | 537 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx" |
521 | 538 | ||
522 | # GStreamer copied recipes | 539 | # GStreamer copied recipes |
523 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" | 540 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" |
524 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.0.imx" | 541 | PREFERRED_VERSION_gst-examples:mx8-nxp-bsp ??= "1.24.7.imx" |
542 | PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx" | ||
525 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" | 543 | PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" |
526 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" | 544 | PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" |
527 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" | 545 | PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" |
528 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" | 546 | PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" |
529 | PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" | 547 | PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" |
530 | PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.0.imx" | 548 | PREFERRED_VERSION_gst-examples:mx9-nxp-bsp ??= "1.24.7.imx" |
549 | PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx" | ||
531 | 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.0.imx" |
532 | 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" |
533 | 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" |
@@ -546,61 +565,62 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1" | |||
546 | # 1 - machine has Vivante GPU driver support | 565 | # 1 - machine has Vivante GPU driver support |
547 | MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" | 566 | MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" |
548 | 567 | ||
549 | # Graphics libraries | 568 | # Override graphics for i.MX GPU |
550 | PREFERRED_PROVIDER_virtual/egl ?= "mesa" | 569 | IMXGPU_GRAPHICS_PROVIDER:imxviv ?= "imx-gpu-viv" |
551 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | 570 | IMXGPU_GRAPHICS_PROVIDER:imxmali ?= "mali-imx" |
552 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 571 | |
553 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 572 | PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
554 | 573 | PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" | |
555 | PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" | 574 | PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" |
556 | PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" | 575 | PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
557 | PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" | 576 | PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
558 | PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" | 577 | PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" |
559 | PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" | 578 | |
560 | PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" | 579 | # The Vivante OpenCL implementation doesn't work with the standard headers and loader |
561 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" | 580 | PREFERRED_PROVIDER_opencl-clhpp:imxviv ?= "imx-gpu-viv" |
562 | PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" | 581 | PREFERRED_PROVIDER_opencl-headers:imxviv ?= "imx-gpu-viv" |
582 | PREFERRED_PROVIDER_opencl-icd-loader:imxviv ?= "imx-gpu-viv" | ||
583 | PREFERRED_PROVIDER_virtual/opencl-icd:imxviv ?= "imx-gpu-viv" | ||
584 | |||
585 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" | ||
586 | PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" | ||
563 | PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" | 587 | PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" |
564 | PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" | ||
565 | PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" | ||
566 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | ||
567 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" | ||
568 | 588 | ||
569 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.4.imx" | 589 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "14.0.1.imx" |
570 | # i.MX 6 & 7 stay on weston 10.0 for fbdev | 590 | # i.MX 6 & 7 stay on weston 10.0 for fbdev |
571 | PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" | 591 | PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" |
572 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" | 592 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" |
573 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" | 593 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
574 | 594 | ||
575 | PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.32.imx" | 595 | PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.37.imx" |
576 | 596 | ||
577 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" | 597 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx" |
578 | 598 | ||
579 | # Use i.MX libdrm Version | 599 | # Use i.MX libdrm Version |
580 | PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx" | 600 | PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.123.imx" |
581 | 601 | ||
582 | PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx" | 602 | PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.275.0.imx" |
583 | PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx" | 603 | PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.275.0.imx" |
584 | PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.261.1.imx" | 604 | PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.275.0.imx" |
585 | PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.261.1.imx" | 605 | PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.275.0.imx" |
586 | PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.261.1.imx" | 606 | PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.275.0.imx" |
587 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx" | 607 | PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx" |
588 | 608 | ||
589 | # Use i.MX optee Version | 609 | # Use i.MX optee Version |
590 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.2.0.imx" | 610 | PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.4.0.imx" |
591 | PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.2.0.imx" | 611 | PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.4.0.imx" |
592 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.2.0.imx" | 612 | PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx" |
593 | PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.2.0.imx" | 613 | PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx" |
594 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.2.0.imx" | 614 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.4.0.imx" |
595 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.2.0.imx" | 615 | PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.4.0.imx" |
596 | 616 | ||
597 | # Use i.MX opencv Version | 617 | # Use i.MX opencv Version |
598 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" | 618 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" |
599 | PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" | 619 | PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx" |
600 | 620 | ||
601 | # Handle default kernel | 621 | # Handle default kernel |
602 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" | 622 | IMX_DEFAULT_KERNEL:imx-mainline-bsp ??= "linux-fslc" |
603 | IMX_DEFAULT_KERNEL:imx-nxp-bsp = "linux-fslc-imx" | 623 | IMX_DEFAULT_KERNEL:imx-nxp-bsp ??= "linux-fslc-imx" |
604 | 624 | ||
605 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" | 625 | PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" |
606 | 626 | ||
@@ -619,7 +639,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" | |||
619 | 639 | ||
620 | IMAGE_BOOT_FILES ?= " \ | 640 | IMAGE_BOOT_FILES ?= " \ |
621 | ${KERNEL_IMAGETYPE} \ | 641 | ${KERNEL_IMAGETYPE} \ |
622 | ${@make_dtb_boot_files(d)} \ | 642 | ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${@make_dtb_boot_files(d)}', d)} \ |
623 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \ | 643 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \ |
624 | " | 644 | " |
625 | 645 | ||
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index 0f9aa1f08..4f5d12986 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc | |||
@@ -6,7 +6,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc | |||
6 | IMX_DEFAULT_BSP = "nxp" | 6 | IMX_DEFAULT_BSP = "nxp" |
7 | 7 | ||
8 | MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" | 8 | MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" |
9 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" | 9 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 dpdk nxpwifi-all-sdio" |
10 | 10 | ||
11 | # Don't include kernels in standard images | 11 | # Don't include kernels in standard images |
12 | RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" | 12 | RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" |
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 442f44778..516dd8a9d 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc | |||
@@ -16,7 +16,7 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" | |||
16 | # and pin it to NXP BSP only | 16 | # and pin it to NXP BSP only |
17 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have | 17 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have |
18 | # a full support for it yet. | 18 | # a full support for it yet. |
19 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" | 19 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 dpdk nxpwifi-all-sdio" |
20 | 20 | ||
21 | KERNEL_DEVICETREE = " \ | 21 | KERNEL_DEVICETREE = " \ |
22 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ | 22 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ |
@@ -73,3 +73,13 @@ TEE_LOAD_ADDR = "0xbe000000" | |||
73 | 73 | ||
74 | # Add additional firmware | 74 | # Add additional firmware |
75 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" | 75 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" |
76 | |||
77 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m4-demos" | ||
78 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
79 | mcore-demos/imx8mm_m4_TCM_hello_world.bin \ | ||
80 | mcore-demos/imx8mm_m4_TCM_low_power_wakeword.bin \ | ||
81 | mcore-demos/imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
82 | mcore-demos/imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
83 | mcore-demos/imx8mm_m4_TCM_sai_low_power_audio.bin \ | ||
84 | mcore-demos/imx8mm_m4_TCM_sai_low_power_audio_wm8524.bin \ | ||
85 | " | ||
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 11657bcce..a51f11edb 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc | |||
@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc | |||
9 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" | 9 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" |
10 | 10 | ||
11 | MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" | 11 | MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" |
12 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-sdio" | ||
12 | 13 | ||
13 | # NXP BSP can consume proprietary jailhouse and Broadcom drivers | 14 | # NXP BSP can consume proprietary jailhouse and Broadcom drivers |
14 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have | 15 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have |
@@ -82,3 +83,11 @@ TEE_LOAD_ADDR = "0x56000000" | |||
82 | 83 | ||
83 | # Add additional firmware | 84 | # Add additional firmware |
84 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" | 85 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" |
86 | |||
87 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos" | ||
88 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
89 | mcore-demos/imx8mn_m7_TCM_hello_world.bin \ | ||
90 | mcore-demos/imx8mn_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
91 | mcore-demos/imx8mn_m7_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
92 | mcore-demos/imx8mn_m7_TCM_sai_low_power_audio.bin \ | ||
93 | " | ||
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index 24e5588f1..d6ae21d55 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc | |||
@@ -13,7 +13,7 @@ MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie n | |||
13 | # NXP BSP can consume proprietary jailhouse and Marvell drivers | 13 | # NXP BSP can consume proprietary jailhouse and Marvell drivers |
14 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have | 14 | # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have |
15 | # a full support for it yet. | 15 | # a full support for it yet. |
16 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997" | 16 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997 nxpwifi-all-pcie nxpwifi-all-sdio dpdk" |
17 | 17 | ||
18 | # Mainline kernel contains only one DTB file for | 18 | # Mainline kernel contains only one DTB file for |
19 | # imx8mpevk machine | 19 | # imx8mpevk machine |
@@ -72,3 +72,12 @@ TEE_LOAD_ADDR = "0x56000000" | |||
72 | 72 | ||
73 | # Add additional firmware | 73 | # Add additional firmware |
74 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" | 74 | MACHINE_FIRMWARE:append = " linux-firmware-ath10k" |
75 | |||
76 | WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m7-demos" | ||
77 | IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \ | ||
78 | mcore-demos/imx8mp_m7_TCM_hello_world.bin \ | ||
79 | mcore-demos/imx8mp_m7_TCM_low_power_wakeword.bin \ | ||
80 | mcore-demos/imx8mp_m7_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \ | ||
81 | mcore-demos/imx8mp_m7_TCM_rpmsg_lite_str_echo_rtos.bin \ | ||
82 | mcore-demos/imx8mp_m7_TCM_sai_low_power_audio.bin \ | ||
83 | " | ||
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 9eaa77c53..e83085860 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc | |||
@@ -4,7 +4,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc | |||
4 | IMX_DEFAULT_BSP = "nxp" | 4 | IMX_DEFAULT_BSP = "nxp" |
5 | 5 | ||
6 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" | 6 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" |
7 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" | 7 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359 nxpwifi-all-pcie nxpwifi-all-sdio" |
8 | 8 | ||
9 | # Don't include kernels in standard images | 9 | # Don't include kernels in standard images |
10 | RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" | 10 | RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" |
@@ -12,7 +12,7 @@ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" | |||
12 | LOADADDR = "" | 12 | LOADADDR = "" |
13 | 13 | ||
14 | # We have to disable SERIAL_CONSOLE due to auto-serial-console | 14 | # We have to disable SERIAL_CONSOLE due to auto-serial-console |
15 | SERIAL_CONSOLES = "115200;ttyAMA0" | 15 | SERIAL_CONSOLES = "115200;ttyLP0" |
16 | 16 | ||
17 | # we do not want to have getty running on tty1 as we run | 17 | # we do not want to have getty running on tty1 as we run |
18 | # auto-serial-console there | 18 | # auto-serial-console there |
@@ -33,8 +33,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
33 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \ | 33 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \ |
34 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \ | 34 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \ |
35 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \ | 35 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \ |
36 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \ | ||
37 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \ | ||
38 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ | 36 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ |
39 | " | 37 | " |
40 | 38 | ||
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc index 3a9222820..e5a3f0e22 100644 --- a/conf/machine/include/imx93-evk.inc +++ b/conf/machine/include/imx93-evk.inc | |||
@@ -4,7 +4,9 @@ require conf/machine/include/imx-base.inc | |||
4 | require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc | 4 | require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc |
5 | 5 | ||
6 | MACHINE_FEATURES += "pci wifi bluetooth" | 6 | MACHINE_FEATURES += "pci wifi bluetooth" |
7 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio" | 7 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio dpdk nxpwifi-all-sdio" |
8 | |||
9 | MACHINE_FIRMWARE:append:use-nxp-bsp = " ethos-u-firmware" | ||
8 | 10 | ||
9 | KERNEL_DEVICETREE = " \ | 11 | KERNEL_DEVICETREE = " \ |
10 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ | 12 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ |
@@ -23,12 +25,24 @@ SPL_BINARY = "spl/u-boot-spl.bin" | |||
23 | UBOOT_CONFIG ??= "sd" | 25 | UBOOT_CONFIG ??= "sd" |
24 | UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" | 26 | UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" |
25 | UBOOT_CONFIG[ecc] = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig" | 27 | UBOOT_CONFIG[ecc] = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig" |
26 | UBOOT_CONFIG[ld] = "${UBOOT_CONFIG_BASENAME}_ld_defconfig" | 28 | UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" |
27 | 29 | ||
28 | # Set ATF platform name | 30 | # Set ATF platform name |
29 | ATF_PLATFORM = "imx93" | 31 | ATF_PLATFORM = "imx93" |
30 | 32 | ||
31 | IMXBOOT_TARGETS = "flash_singleboot" | 33 | IMXBOOT_TARGETS = \ |
34 | "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ | ||
35 | bb.utils.contains('UBOOT_CONFIG', 'ecc', '${IMXBOOT_TARGETS_ECC}', \ | ||
36 | bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \ | ||
37 | 'INVALID', d), d), d)}" | ||
38 | # Note different SD targets for different Glitch Detection (GDET) modes: | ||
39 | # | Target | Glitch Detection | | ||
40 | # | flash_singleboot | None | | ||
41 | # | flash_singleboot_gdet | Enabled | | ||
42 | # | flash_singleboot_gdet_auto | Enabled during EdgeLock Secure Enclave API calls | | ||
43 | IMXBOOT_TARGETS_SD = "flash_singleboot flash_singleboot_gdet flash_singleboot_gdet_auto" | ||
44 | IMXBOOT_TARGETS_ECC = "flash_singleboot" | ||
45 | IMXBOOT_TARGETS_FSPI = "flash_singleboot_flexspi" | ||
32 | 46 | ||
33 | IMX_BOOT_SOC_TARGET = "iMX9" | 47 | IMX_BOOT_SOC_TARGET = "iMX9" |
34 | IMX_BOOT_SEEK = "32" | 48 | IMX_BOOT_SEEK = "32" |
diff --git a/conf/machine/include/imx95-evk.inc b/conf/machine/include/imx95-evk.inc new file mode 100644 index 000000000..d78745cfc --- /dev/null +++ b/conf/machine/include/imx95-evk.inc | |||
@@ -0,0 +1,58 @@ | |||
1 | require conf/machine/include/imx-base.inc | ||
2 | require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc | ||
3 | |||
4 | MACHINE_FEATURES += "pci wifi bluetooth optee" | ||
5 | MACHINE_FEATURES:append:use-nxp-bsp = " nxpwifi-all-pcie nxpwifi-all-sdio jailhouse dpdk xen" | ||
6 | |||
7 | KERNEL_DEVICETREE = " \ | ||
8 | freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ | ||
9 | " | ||
10 | |||
11 | IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" | ||
12 | IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" | ||
13 | |||
14 | LOADADDR = "" | ||
15 | UBOOT_SUFFIX = "bin" | ||
16 | UBOOT_MAKE_TARGET = "" | ||
17 | |||
18 | SPL_BINARY = "spl/u-boot-spl.bin" | ||
19 | |||
20 | UBOOT_CONFIG ??= "sd" | ||
21 | UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_evk_defconfig,sdcard" | ||
22 | UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_evk_fspi_defconfig" | ||
23 | |||
24 | ATF_PLATFORM = "imx95" | ||
25 | OEI_CONFIGS = "ddr tcm" | ||
26 | OEI_CORE = "m33" | ||
27 | OEI_SOC = "mx95" | ||
28 | OEI_BOARD ?= "mx95lp5" | ||
29 | DDR_TYPE ?= "lpddr5" | ||
30 | |||
31 | IMXBOOT_VARIANTS = "alt jailhouse netc sof" | ||
32 | |||
33 | # Multiple system manager configs by IMXBOOT_VARIANT | ||
34 | SYSTEM_MANAGER_CONFIG = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt', 'mx95alt', \ | ||
35 | bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', 'mx95evkjailhouse', \ | ||
36 | bb.utils.contains('IMXBOOT_VARIANT', 'netc', 'mx95netc', \ | ||
37 | bb.utils.contains('IMXBOOT_VARIANT', 'sof', 'mx95evksof', \ | ||
38 | 'mx95evk', d), d), d), d)}" | ||
39 | |||
40 | # imx-boot (flash.bin) targets based on UBOOT_CONFIG and IMXBOOT_VARIANT | ||
41 | IMXBOOT_TARGETS_SD = "${@bb.utils.contains('IMXBOOT_VARIANT', 'alt', '${IMXBOOT_TARGETS_BASENAME}_alt', \ | ||
42 | bb.utils.contains('IMXBOOT_VARIANT', 'jailhouse', '${IMXBOOT_TARGETS_BASENAME}_jailhouse', \ | ||
43 | bb.utils.contains('IMXBOOT_VARIANT', 'netc', '${IMXBOOT_TARGETS_BASENAME}_netc', \ | ||
44 | bb.utils.contains('IMXBOOT_VARIANT', 'sof', '${IMXBOOT_TARGETS_BASENAME}_a55', \ | ||
45 | '${IMXBOOT_TARGETS_BASENAME}_all ${IMXBOOT_TARGETS_BASENAME}_a55', d), d), d), d)} \ | ||
46 | " | ||
47 | |||
48 | IMXBOOT_TARGETS = " \ | ||
49 | ${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_a55_flexspi', '${IMXBOOT_TARGETS_SD}', d)} \ | ||
50 | " | ||
51 | |||
52 | IMX_BOOT_SOC_TARGET = "iMX95" | ||
53 | IMX_BOOT_SEEK = "32" | ||
54 | |||
55 | # We have to disable SERIAL_CONSOLE due to auto-serial-console | ||
56 | SERIAL_CONSOLES = "115200;ttyLP0" | ||
57 | |||
58 | IMX_DEFAULT_BSP = "nxp" | ||
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 ?= "" |
diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf index 7de1e990a..2bc827153 100644 --- a/conf/machine/ls1012afrwy.conf +++ b/conf/machine/ls1012afrwy.conf | |||
@@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
12 | 12 | ||
13 | MACHINE_FEATURES += "optee" | 13 | MACHINE_FEATURES += "optee" |
14 | 14 | ||
15 | KERNEL_CLASSES = " kernel-fitimage " | 15 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
16 | KERNEL_IMAGETYPES = "fitImage" | ||
17 | 16 | ||
18 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 17 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
19 | UBOOT_ENTRYPOINT = "0x80080000" | 18 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf index 879e3f8fb..a170b0529 100644 --- a/conf/machine/ls1012ardb.conf +++ b/conf/machine/ls1012ardb.conf | |||
@@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
12 | 12 | ||
13 | MACHINE_FEATURES += "optee" | 13 | MACHINE_FEATURES += "optee" |
14 | 14 | ||
15 | KERNEL_CLASSES = " kernel-fitimage " | 15 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
16 | KERNEL_IMAGETYPES = "fitImage" | ||
17 | 16 | ||
18 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 17 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
19 | UBOOT_ENTRYPOINT = "0x80080000" | 18 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf index 268a60c3e..68249a402 100644 --- a/conf/machine/ls1028ardb.conf +++ b/conf/machine/ls1028ardb.conf | |||
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 16 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf index 4ff3c0acb..8723a7ddd 100644 --- a/conf/machine/ls1043ardb.conf +++ b/conf/machine/ls1043ardb.conf | |||
@@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
12 | 12 | ||
13 | MACHINE_FEATURES += "optee" | 13 | MACHINE_FEATURES += "optee" |
14 | 14 | ||
15 | KERNEL_CLASSES = " kernel-fitimage " | 15 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
16 | KERNEL_IMAGETYPES = "fitImage" | ||
17 | 16 | ||
18 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 17 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
19 | UBOOT_ENTRYPOINT = "0x80080000" | 18 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf index eb3c0bb6f..4de0d9def 100644 --- a/conf/machine/ls1046afrwy.conf +++ b/conf/machine/ls1046afrwy.conf | |||
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 16 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index 2b82c98f0..b2d9fa1ca 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf | |||
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 16 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf index f9d05b690..ba66ab355 100644 --- a/conf/machine/ls1088ardb-pb.conf +++ b/conf/machine/ls1088ardb-pb.conf | |||
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 16 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf index 1b7a4f3cb..13a1f6240 100644 --- a/conf/machine/ls1088ardb.conf +++ b/conf/machine/ls1088ardb.conf | |||
@@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 16 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf index 8c8e586a4..617591e4b 100644 --- a/conf/machine/ls2088ardb.conf +++ b/conf/machine/ls2088ardb.conf | |||
@@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:" | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | UBOOT_DTB_LOADADDRESS = "0x90000000" | 16 | UBOOT_DTB_LOADADDRESS = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf index 1945ad310..c8fbcc1cd 100644 --- a/conf/machine/lx2160ardb.conf +++ b/conf/machine/lx2160ardb.conf | |||
@@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:" | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | DTB_LOAD = "0x90000000" | 16 | DTB_LOAD = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |
diff --git a/conf/machine/lx2162aqds.conf b/conf/machine/lx2162aqds.conf index 80f91331b..1842daff6 100644 --- a/conf/machine/lx2162aqds.conf +++ b/conf/machine/lx2162aqds.conf | |||
@@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2162a:" | |||
11 | 11 | ||
12 | MACHINE_FEATURES += "optee" | 12 | MACHINE_FEATURES += "optee" |
13 | 13 | ||
14 | KERNEL_CLASSES = " kernel-fitimage " | 14 | KERNEL_CLASSES += "kernel-fit-extra-artifacts" |
15 | KERNEL_IMAGETYPES = "fitImage" | ||
16 | 15 | ||
17 | DTB_LOAD = "0x90000000" | 16 | DTB_LOAD = "0x90000000" |
18 | UBOOT_ENTRYPOINT = "0x80080000" | 17 | UBOOT_ENTRYPOINT = "0x80080000" |