diff options
Diffstat (limited to 'conf/machine')
36 files changed, 285 insertions, 285 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index b7aec8c2..0b5274cb 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -26,7 +26,7 @@ KERNEL_DEVICETREE = " \ imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \ imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp = " \ +KERNEL_DEVICETREE:use-mainline-bsp = " \ imx6qp-sabreauto.dtb \ imx6q-sabreauto.dtb \ imx6dl-sabreauto.dtb \ @@ -34,18 +34,18 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ ### u-boot-fslc settings ### -SPL_BINARY_pn-u-boot-fslc = "SPL" -UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabreauto_defconfig" -UBOOT_SUFFIX_pn-u-boot-fslc = "img" +SPL_BINARY:pn-u-boot-fslc = "SPL" +UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabreauto_defconfig" +UBOOT_SUFFIX:pn-u-boot-fslc = "img" ### u-boot-imx settings ### # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC # variants. Change the defconfig to the targeted SoC variant. -SPL_BINARY_pn-u-boot-imx = "" -UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabreauto_defconfig" -UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" -UBOOT_SUFFIX_pn-u-boot-imx = "imx" +SPL_BINARY:pn-u-boot-imx = "" +UBOOT_MACHINE:pn-u-boot-imx = "mx6qsabreauto_defconfig" +UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" +UBOOT_SUFFIX:pn-u-boot-imx = "imx" WKS_FILE = " \ ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ @@ -54,6 +54,6 @@ WKS_FILE = " \ SERIAL_CONSOLES = "115200;ttymxc3" -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" +MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index b3d09e93..27a2e9d7 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -35,7 +35,7 @@ KERNEL_DEVICETREE = " \ imx6dl-sabresd-hdcp.dtb \ imx6dl-sabresd-ldo.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp = " \ +KERNEL_DEVICETREE:use-mainline-bsp = " \ imx6qp-sabresd.dtb \ imx6q-sabresd.dtb \ imx6dl-sabresd.dtb \ @@ -43,18 +43,18 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ ### u-boot-fslc settings ### -SPL_BINARY_pn-u-boot-fslc = "SPL" -UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig" -UBOOT_SUFFIX_pn-u-boot-fslc = "img" +SPL_BINARY:pn-u-boot-fslc = "SPL" +UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabresd_defconfig" +UBOOT_SUFFIX:pn-u-boot-fslc = "img" ### u-boot-imx settings ### # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC # variants. Change the defconfig to the targeted SoC variant. -SPL_BINARY_pn-u-boot-imx = "" -UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig" -UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" -UBOOT_SUFFIX_pn-u-boot-imx = "imx" +SPL_BINARY:pn-u-boot-imx = "" +UBOOT_MACHINE:pn-u-boot-imx ?= "mx6qsabresd_defconfig" +UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" +UBOOT_SUFFIX:pn-u-boot-imx = "imx" WKS_FILE = " \ ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ @@ -63,6 +63,6 @@ WKS_FILE = " \ SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" +MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index 1e8c403b..8bef21b6 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -10,7 +10,7 @@ include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sl-evk.dtb" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx6sl-evk-btwifi.dtb \ imx6sl-evk-csi.dtb \ imx6sl-evk-ldo.dtb \ diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 30b537f1..6282533a 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -23,7 +23,7 @@ UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config,sdcard" UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" -OPTEE_BIN_EXT_imx6sllevk = "6sllevk" +OPTEE_BIN_EXT:imx6sllevk = "6sllevk" SERIAL_CONSOLES = "115200;ttymxc0" diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index f7031ccb..2354635e 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -10,7 +10,7 @@ require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb" -KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb" +KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb" UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX = "imx" @@ -29,6 +29,6 @@ OPTEE_BIN_EXT = "6sxauto" SERIAL_CONSOLES = "115200;ttymxc3" -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" +MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index ff7d6ae6..fcfcbd5f 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -14,7 +14,7 @@ KERNEL_DEVICETREE = " \ imx6sx-sdb-reva.dtb \ imx6sx-sdb-sai.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx6sx-sdb-btwifi.dtb \ imx6sx-sdb-emmc.dtb \ imx6sx-sdb-lcdif1.dtb \ @@ -43,6 +43,6 @@ OPTEE_BIN_EXT = "6sxsdb" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" +MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index f7c5d8ae..6fd14456 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -21,19 +21,19 @@ KERNEL_DEVICETREE = " \ imx6ul-14x14-evk-emmc.dtb \ imx6ul-14x14-evk-gpmi-weim.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" +KERNEL_DEVICETREE:use-mainline-bsp = "imx6ul-14x14-evk.dtb" ### u-boot-fslc settings ### -SPL_BINARY_pn-u-boot-fslc = "SPL" -UBOOT_SUFFIX_pn-u-boot-fslc = "img" +SPL_BINARY:pn-u-boot-fslc = "SPL" +UBOOT_SUFFIX:pn-u-boot-fslc = "img" ### u-boot-imx settings ### # The u-boot-imx does not provide SPL support -SPL_BINARY_pn-u-boot-imx = "" -UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" -UBOOT_SUFFIX_pn-u-boot-imx = "imx" +SPL_BINARY:pn-u-boot-imx = "" +UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" +UBOOT_SUFFIX:pn-u-boot-imx = "imx" WKS_FILE = " \ ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index bd592a20..f5b7309f 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -15,7 +15,7 @@ KERNEL_DEVICETREE = " \ imx6ull-14x14-evk.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx6ull-14x14-evk-btwifi.dtb \ imx6ull-14x14-evk-btwifi-oob.dtb \ imx6ull-14x14-evk-emmc.dtb \ diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index 7b794e7c..a27f1ef1 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf @@ -14,7 +14,7 @@ MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" KERNEL_DEVICETREE = " \ imx6ulz-14x14-evk.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx6ulz-14x14-evk-btwifi.dtb \ imx6ulz-14x14-evk-emmc.dtb \ imx6ulz-14x14-evk-gpmi-weim.dtb \ diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index e848f294..860c8007 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf @@ -12,7 +12,7 @@ require conf/machine/include/tune-cortexa7.inc MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" KERNEL_DEVICETREE = "imx7d-sdb.dtb" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx7d-sdb-epdc.dtb \ imx7d-sdb-gpmi-weim.dtb \ imx7d-sdb-m4.dtb \ diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index a587f44b..d685a90c 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -14,10 +14,10 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43430" KERNEL_DEVICETREE = " \ imx7ulp-evk.dtb \ " -KERNEL_DEVICETREE_append_use-mainline-bsp = " \ +KERNEL_DEVICETREE:append:use-mainline-bsp = " \ imx7ulp-com.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx7ulp-evk-ft5416.dtb \ imx7ulp-evk-mipi.dtb \ imx7ulp-evkb.dtb \ diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf index 1ea5260b..d44a4732 100644 --- a/conf/machine/imx8dxl-lpddr4-evk.conf +++ b/conf/machine/imx8dxl-lpddr4-evk.conf @@ -5,7 +5,7 @@ require conf/machine/include/imx8dxl-evk.inc KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf index 3901bb92..f21cc381 100644 --- a/conf/machine/imx8mm-ddr4-evk.conf +++ b/conf/machine/imx8mm-ddr4-evk.conf @@ -7,7 +7,7 @@ require include/imx8mm-evk.inc KERNEL_DEVICETREE_BASENAME = "${MACHINE}" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \ " diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf index 6007c540..0a85ed20 100644 --- a/conf/machine/imx8mm-lpddr4-evk.conf +++ b/conf/machine/imx8mm-lpddr4-evk.conf @@ -8,7 +8,7 @@ require include/imx8mm-evk.inc # The device tree name is implicit for LPDDR4, so can't use MACHINE here KERNEL_DEVICETREE_BASENAME = "imx8mm-evk" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \ diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf index 442afdbd..d004d2ae 100644 --- a/conf/machine/imx8mn-ddr4-evk.conf +++ b/conf/machine/imx8mn-ddr4-evk.conf @@ -7,7 +7,7 @@ require include/imx8mn-evk.inc KERNEL_DEVICETREE_BASENAME = "${MACHINE}" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk" diff --git a/conf/machine/imx8mn-lpddr4-evk.conf b/conf/machine/imx8mn-lpddr4-evk.conf index 7c58bc19..2e5e6be9 100644 --- a/conf/machine/imx8mn-lpddr4-evk.conf +++ b/conf/machine/imx8mn-lpddr4-evk.conf @@ -8,7 +8,7 @@ require include/imx8mn-evk.inc # The device tree name is implicit for LPDDR4, so can't use MACHINE here KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ " UBOOT_CONFIG_BASENAME = "imx8mn_evk" diff --git a/conf/machine/imx8mp-ddr4-evk.conf b/conf/machine/imx8mp-ddr4-evk.conf index 09517769..78e0c160 100644 --- a/conf/machine/imx8mp-ddr4-evk.conf +++ b/conf/machine/imx8mp-ddr4-evk.conf @@ -8,7 +8,7 @@ require include/imx8mp-evk.inc # FIXME: This machine is not yet supported by u-boot-fslc, so for now # use u-boot-imx for mainline. -IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-imx" KERNEL_DEVICETREE_BASENAME = "${MACHINE}" diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf index cf926c08..76a1f449 100644 --- a/conf/machine/imx8mp-lpddr4-evk.conf +++ b/conf/machine/imx8mp-lpddr4-evk.conf @@ -11,7 +11,7 @@ KERNEL_DEVICETREE_BASENAME = "imx8mp-evk" # NXP kernel has additional DTB files for various board configuration and # derivates. Include them here for NXP BSP only -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/imx8mp-ab2.dtb \ freescale/imx8mp-evk-basler.dtb \ freescale/imx8mp-evk-basler-ov2775.dtb \ diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index 9907ef4b..b6dcd890 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf @@ -12,14 +12,14 @@ require conf/machine/include/tune-cortexa53.inc IMX_DEFAULT_BSP = "nxp" MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356" -MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" +MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" -MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" +MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" KERNEL_DEVICETREE = " \ freescale/imx8mq-evk.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/imx8mq-evk-ak4497.dtb \ freescale/imx8mq-evk-audio-tdm.dtb \ freescale/imx8mq-evk-dcss-adv7535.dtb \ @@ -40,8 +40,8 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \ freescale/imx8mq-evk-usdhc2-m2.dtb \ " -IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" -IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" +IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" UBOOT_SUFFIX = "bin" @@ -77,7 +77,7 @@ IMX_BOOT_SEEK = "33" OPTEE_BIN_EXT = "8mq" # Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" +MACHINE_FIRMWARE:append = " linux-firmware-ath10k" # Use gstreamer 1.16 from meta-freescale PREFERRED_VERSION_gstreamer1.0 ?= "1.16.imx" diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index 5ceb6b8b..eb6ceced 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf @@ -11,10 +11,10 @@ require conf/machine/include/tune-cortexa72-cortexa53.inc IMX_DEFAULT_BSP = "nxp" MACHINE_FEATURES += "pci optee bcm43455 bcm4356" -MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" +MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" @@ -55,8 +55,8 @@ UBOOT_MAKE_TARGET = \ SPL_BINARY = \ "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \ '', d)}" -IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" -IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" +IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" UBOOT_SUFFIX = "bin" @@ -86,4 +86,4 @@ IMX_BOOT_SOC_TARGET = "iMX8QM" BOARD_TYPE = "mek" # Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" +MACHINE_FIRMWARE:append = " linux-firmware-ath10k" diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf index 5b29138f..29412cc3 100644 --- a/conf/machine/imx8qxp-mek.conf +++ b/conf/machine/imx8qxp-mek.conf @@ -8,7 +8,7 @@ MACHINEOVERRIDES =. "mx8qxp:" require include/imx8x-mek.inc KERNEL_DEVICETREE_BASENAME = "${MACHINE}" -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc index 72b958cd..f384b34a 100644 --- a/conf/machine/include/e5500-64b.inc +++ b/conf/machine/include/e5500-64b.inc @@ -8,4 +8,4 @@ MACHINEOVERRIDES =. "e5500-64b:" require conf/multilib.conf MULTILIBS ?= "multilib:lib32" -DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500" +DEFAULTTUNE:virtclass-multilib-lib32 ?= "ppce5500" diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc index e0e04dbc..a94cb3b1 100644 --- a/conf/machine/include/e6500-64b.inc +++ b/conf/machine/include/e6500-64b.inc @@ -8,4 +8,4 @@ MACHINEOVERRIDES =. "e6500-64b:" require conf/multilib.conf MULTILIBS ?= "multilib:lib32" -DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500" +DEFAULTTUNE:virtclass-multilib-lib32 ?= "ppce6500" diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc index 8d773b6e..771fbe29 100644 --- a/conf/machine/include/e6500.inc +++ b/conf/machine/include/e6500.inc @@ -9,4 +9,4 @@ BUILD_64BIT_KERNEL = "1" require conf/multilib.conf MULTILIBS ?= "multilib:lib64" -DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500" +DEFAULTTUNE:virtclass-multilib-lib64 ?= "ppc64e6500" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index f92a08af..b8bcecab 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -13,8 +13,8 @@ require conf/machine/include/utilities.inc IMX_DEFAULT_BSP ?= "mainline" # Those are SoC families we'd like to force the use of mainline BSP. -IMX_DEFAULT_BSP_mxs ?= "mainline" -IMX_DEFAULT_BSP_mx5 ?= "mainline" +IMX_DEFAULT_BSP:mxs ?= "mainline" +IMX_DEFAULT_BSP:mx5 ?= "mainline" MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" @@ -32,16 +32,16 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" # ,----[ imx6qdlsabresd.conf ] # | ### u-boot-fslc settings ### # | -# | SPL_BINARY_pn-u-boot-fslc = "SPL" -# | UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig" -# | UBOOT_SUFFIX_pn-u-boot-fslc = "img" +# | SPL_BINARY:pn-u-boot-fslc = "SPL" +# | UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabresd_defconfig" +# | UBOOT_SUFFIX:pn-u-boot-fslc = "img" # | # | ### u-boot-imx settings ### # | # | # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC # | # variants. Change the defconfig to the targeted SoC variant. -# | UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig" -# | UBOOT_SUFFIX_pn-u-boot-imx = "imx" +# | UBOOT_MACHINE:pn-u-boot-imx ?= "mx6qsabresd_defconfig" +# | UBOOT_SUFFIX:pn-u-boot-imx = "imx" # `---- # # As result, the 'UBOOT_SUFFIX' is dynamically set based on the preferred U-Boot @@ -61,7 +61,7 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" # | UBOOT_MACHINE = "mx53loco_config" # `---- IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" -UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}" +UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}" # We need to export the original variable to allow it to be used when generating # wic based images. @@ -75,33 +75,33 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" -UBOOT_ENTRYPOINT_mxs = "0x40008000" -UBOOT_ENTRYPOINT_mx51 = "0x90008000" -UBOOT_ENTRYPOINT_mx53 = "0x70008000" -UBOOT_ENTRYPOINT_mx6 = "0x10008000" -UBOOT_ENTRYPOINT_mx6sl = "0x80008000" -UBOOT_ENTRYPOINT_mx6sll = "0x80008000" -UBOOT_ENTRYPOINT_mx6sx = "0x80008000" -UBOOT_ENTRYPOINT_mx6ul = "0x80008000" -UBOOT_ENTRYPOINT_mx6ull = "0x80008000" -UBOOT_ENTRYPOINT_mx6ulz = "0x80008000" -UBOOT_ENTRYPOINT_mx7 = "0x80008000" -UBOOT_ENTRYPOINT_mx7ulp = "0x60008000" -UBOOT_ENTRYPOINT_mx8m = "0x40480000" -UBOOT_ENTRYPOINT_vf = "0x80008000" +UBOOT_ENTRYPOINT:mxs = "0x40008000" +UBOOT_ENTRYPOINT:mx51 = "0x90008000" +UBOOT_ENTRYPOINT:mx53 = "0x70008000" +UBOOT_ENTRYPOINT:mx6 = "0x10008000" +UBOOT_ENTRYPOINT:mx6sl = "0x80008000" +UBOOT_ENTRYPOINT:mx6sll = "0x80008000" +UBOOT_ENTRYPOINT:mx6sx = "0x80008000" +UBOOT_ENTRYPOINT:mx6ul = "0x80008000" +UBOOT_ENTRYPOINT:mx6ull = "0x80008000" +UBOOT_ENTRYPOINT:mx6ulz = "0x80008000" +UBOOT_ENTRYPOINT:mx7 = "0x80008000" +UBOOT_ENTRYPOINT:mx7ulp = "0x60008000" +UBOOT_ENTRYPOINT:mx8m = "0x40480000" +UBOOT_ENTRYPOINT:vf = "0x80008000" # Some derivates can utilize the boot container provided by U-Boot, # below variable sets that those machines which have a imx-boot-container # in their MACHINEOVERRIDES can inherit a imx-boot-container class UBOOT_PROVIDES_BOOT_CONTAINER = "0" -UBOOT_PROVIDES_BOOT_CONTAINER_imx-boot-container = "1" +UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante" -XSERVER_DRIVER_vf = "xf86-video-modesetting" -XSERVER_DRIVER_append_mx8 = " xf86-video-modesetting" -XSERVER_DRIVER_use-mainline-bsp = " \ +XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" +XSERVER_DRIVER:vf = "xf86-video-modesetting" +XSERVER_DRIVER:append:mx8 = " xf86-video-modesetting" +XSERVER_DRIVER:use-mainline-bsp = " \ xf86-video-fbdev \ xf86-video-modesetting \ xserver-xorg-extension-glx \ @@ -118,41 +118,41 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" # ARM_INSTRUCTION_SET = "thumb" # # handled by software -# DEFAULTTUNE_mx6 ?= "cortexa9t-neon" +# DEFAULTTUNE:mx6 ?= "cortexa9t-neon" # handled by hardware -DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" -DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" -DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon" -DEFAULTTUNE_mx6ulz ?= "cortexa7thf-neon" -DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" -DEFAULTTUNE_vf ?= "cortexa5thf-neon" +DEFAULTTUNE:mx6 ?= "cortexa9thf-neon" +DEFAULTTUNE:mx6ul ?= "cortexa7thf-neon" +DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon" +DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon" +DEFAULTTUNE:mx7 ?= "cortexa7thf-neon" +DEFAULTTUNE:vf ?= "cortexa5thf-neon" -DEFAULTTUNE_mx8m ?= "cortexa53-crypto" -DEFAULTTUNE_mx8qm ?= "cortexa72-cortexa53-crypto" -DEFAULTTUNE_mx8qxp ?= "cortexa35-crypto" +DEFAULTTUNE:mx8m ?= "cortexa53-crypto" +DEFAULTTUNE:mx8qm ?= "cortexa72-cortexa53-crypto" +DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto" INHERIT += "machine-overrides-extender" -MACHINEOVERRIDES_EXTENDER_mx25 = "use-mainline-bsp" -MACHINEOVERRIDES_EXTENDER_mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp" -MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx6ulz = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8mn = "imxdrm:imxgpu:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8dxl = "imxfbdev" - -MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ +MACHINEOVERRIDES_EXTENDER:mx25 = "use-mainline-bsp" +MACHINEOVERRIDES_EXTENDER:mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" +MACHINEOVERRIDES_EXTENDER:mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" +MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc" +MACHINEOVERRIDES_EXTENDER:mx6ul = "imxfbdev:imxpxp" +MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc" +MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc" +MACHINEOVERRIDES_EXTENDER:mx7d = "imxfbdev:imxpxp:imxepdc" +MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx8mn = "imxdrm:imxgpu:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev" + +MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \ imx \ \ mx6 \ @@ -182,40 +182,40 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" -MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl" -MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl" -MACHINE_SOCARCH_SUFFIX_mx6sx = "-mx6sx" -MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl" -MACHINE_SOCARCH_SUFFIX_mx6sll= "-mx6sll" -MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d" -MACHINE_SOCARCH_SUFFIX_mx7ulp = "-mx7ulp" -MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" -MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" -MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" -MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" -MACHINE_SOCARCH_SUFFIX_mx6ulz = "-mx6ul" -MACHINE_SOCARCH_SUFFIX_mx8qm = "-mx8" -MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm" -MACHINE_SOCARCH_SUFFIX_mx8mn = "-mx8mn" -MACHINE_SOCARCH_SUFFIX_mx8mp = "-mx8mp" -MACHINE_SOCARCH_SUFFIX_mx8mq = "-mx8m" -MACHINE_SOCARCH_SUFFIX_mx8qxp = "-mx8" -MACHINE_SOCARCH_SUFFIX_mx8dxl = "-mx8dxl" -MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx" +MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl" +MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl" +MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx" +MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl" +MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll" +MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d" +MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp" +MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60" +MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50" +MACHINE_SOCARCH_SUFFIX:mx6ul = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul" +MACHINE_SOCARCH_SUFFIX:mx8qm = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8mm = "-mx8mm" +MACHINE_SOCARCH_SUFFIX:mx8mn = "-mx8mn" +MACHINE_SOCARCH_SUFFIX:mx8mp = "-mx8mp" +MACHINE_SOCARCH_SUFFIX:mx8mq = "-mx8m" +MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8" +MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl" +MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER_append_imx = " \ +MACHINE_SOCARCH_FILTER:append_imx = " \ alsa-lib \ gstreamer1.0 \ weston \ " -MACHINE_SOCARCH_FILTER_append_imxvpu = " \ +MACHINE_SOCARCH_FILTER:append:imxvpu = " \ imx-codec \ imx-vpuwrap \ libimxvpuapi \ virtual/imxvpu \ " -MACHINE_SOCARCH_FILTER_append_imxgpu = " \ +MACHINE_SOCARCH_FILTER:append:imxgpu = " \ virtual/egl \ virtual/mesa \ virtual/libopenvg \ @@ -225,15 +225,15 @@ MACHINE_SOCARCH_FILTER_append_imxgpu = " \ opencv \ pango \ " -MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ +MACHINE_SOCARCH_FILTER:append:imxgpu2d = " \ virtual/libg2d \ " -MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \ +MACHINE_SOCARCH_FILTER:append:imxgpu3d = " \ virtual/libgl \ virtual/libgles1 \ virtual/libgles2 \ " -MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ +MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \ virtual/egl \ virtual/libopenvg \ virtual/libg2d \ @@ -245,23 +245,23 @@ MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ pango \ qtbase \ " -MACHINE_SOCARCH_FILTER_append_mx6q = " \ +MACHINE_SOCARCH_FILTER:append:mx6q = " \ opencl-icd-loader \ opencl-clhpp \ opencl-headers \ " -MACHINE_SOCARCH_FILTER_append_mx8 = " \ +MACHINE_SOCARCH_FILTER:append:mx8 = " \ opencl-icd-loader \ opencl-clhpp \ opencl-headers \ " -MACHINE_SOCARCH_FILTER_append_mx8qm = " \ +MACHINE_SOCARCH_FILTER:append:mx8qm = " \ virtual/libopenvx \ " INHERIT += "fsl-dynamic-packagearch" -SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \ +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \ imx-gpu-viv->kernel-module-imx-gpu-viv \ libimxvpuapi->virtual/imxvpu \ imx-vpuwrap->virtual/imxvpu \ @@ -271,44 +271,44 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \ # Firmware MACHINE_FIRMWARE ?= "" -MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25" -MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27" -MACHINE_FIRMWARE_append_mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" -MACHINE_FIRMWARE_append_mx6 = " linux-firmware-imx-sdma-imx6q" -MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" -MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" -MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc" -MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc" -MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc" -MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" -MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" -MACHINE_FIRMWARE_append_mx8mm = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE_append_mx8mn = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE_append_mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" -MACHINE_FIRMWARE_append_mx8mq = " linux-firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE_append_mx8qm = " firmware-imx-vpu-imx8" -MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8" -MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" +MACHINE_FIRMWARE:append:mx25 = " firmware-imx-sdma-imx25" +MACHINE_FIRMWARE:append_mx27 = " firmware-imx-vpu-imx27" +MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q" +MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q" +MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6sl = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6sll = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx6ull = " firmware-imx-epdc" +MACHINE_FIRMWARE:append:mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" +MACHINE_FIRMWARE:append:mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" +MACHINE_FIRMWARE:append:mx8mm = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8mn = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" +MACHINE_FIRMWARE:append:mx8mq = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8qm = " firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8" +MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" # Extra audio support IMX_ALSA_EXTRA = "" -IMX_ALSA_EXTRA_use-nxp-bsp = "imx-alsa-plugins" -MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins" +MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" # Extra Cypress Wi-Fi and BTW firmware (Murata) -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" +MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" # Extra QCA Wi-Fi & BTE driver and firmware -MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" +MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}" # Extra udev rules MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" @@ -320,29 +320,29 @@ MACHINE_EXTRA_RRECOMMENDS += " \ # GStreamer 1.0 plugins MACHINE_GSTREAMER_1_0_PLUGIN ?= "" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6sl ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6sx ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6ul ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6ull ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx7d ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx8mm ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN_mx8mn ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN_mx8mp ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN_mx8mq ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN_mx8qm ?= "imx-gst1.0-plugin" -MACHINE_GSTREAMER_1_0_PLUGIN_mx8qxp ?= "imx-gst1.0-plugin" - -PREFERRED_VERSION_gstreamer1.0_mx8 ?= "1.16.2.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.16.2.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.16.3.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 ?= "1.16.3.imx" -PREFERRED_VERSION_gstreamer1.0-libav_mx8 ?= "1.16.0" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6q ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx7d ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin" + +PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.16.2.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.16.2.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.16.3.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.16.3.imx" +PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.16.0" # Determines if the SoC has support for Vivante kernel driver SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1" +SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1" # Handle Vivante kernel driver setting: # 0 - machine does not have Vivante GPU driver support @@ -361,53 +361,53 @@ PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" -PREFERRED_PROVIDER_opencl-clhpp_imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_opencl-headers_imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_opencl-icd-loader_imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" PREFERRED_VERSION_weston_imx ?= "9.0.0.imx" -PREFERRED_VERSION_weston_use-mainline-bsp = "" +PREFERRED_VERSION_weston:use-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.20.imx" -PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.20.imx" -PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.20.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm_mx6 ?= "2.4.102.imx" -PREFERRED_VERSION_libdrm_mx7 ?= "2.4.102.imx" -PREFERRED_VERSION_libdrm_mx8 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm:mx6 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm:mx7 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm:mx8 ?= "2.4.102.imx" # Use i.MX optee Version -PREFERRED_VERSION_optee-os_mx8 ?= "3.10.0.imx" -PREFERRED_VERSION_optee-client_mx8 ?= "3.10.0.imx" -PREFERRED_VERSION_optee-test_mx8 ?= "3.10.0.imx" +PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx" +PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx" +PREFERRED_VERSION_optee-test:mx8 ?= "3.10.0.imx" #Use i.MX opencv Version for mx8 -PREFERRED_VERSION_opencv_mx8 ?= "4.5.2.imx" +PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx" # Handle default kernel IMX_DEFAULT_KERNEL = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mxs = "linux-fslc" -IMX_DEFAULT_KERNEL_mx5 = "linux-fslc" -IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx8 = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx7ulp = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx6sll = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" -IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc" +IMX_DEFAULT_KERNEL:mxs = "linux-fslc" +IMX_DEFAULT_KERNEL:mx5 = "linux-fslc" +IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx" +IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc" PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" -SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" +SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" # Do not update fstab file when using wic images WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" OPTEE_BOOT_IMAGE = "uTee" -OPTEE_BOOT_IMAGE_aarch64 = "" +OPTEE_BOOT_IMAGE:aarch64 = "" IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" @@ -419,7 +419,7 @@ IMAGE_BOOT_FILES ?= " \ ### wic default support OPTEE_WKS_FILE_DEPENDS = "optee-os" -OPTEE_WKS_FILE_DEPENDS_aarch64 = "" +OPTEE_WKS_FILE_DEPENDS:aarch64 = "" WKS_FILE_DEPENDS ?= " \ virtual/bootloader \ @@ -429,8 +429,8 @@ WKS_FILE_DEPENDS ?= " \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " -WKS_FILE_DEPENDS_append_mx8 = " imx-boot" -WKS_FILE_DEPENDS_append_mx8m = " imx-boot" +WKS_FILE_DEPENDS:append:mx8 = " imx-boot" +WKS_FILE_DEPENDS:append:mx8m = " imx-boot" # We need to restrict the append so we don't add this for other i.MX SoC's. # Derivatives that are not yet adopted the usage of boot container provided @@ -444,15 +444,15 @@ WKS_FILE_DEPENDS_append_mx8m = " imx-boot" # deployment task extesion execution defined in imx-boot-container class. # For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile # task. -WKS_FILE_DEPENDS_append_use-mainline-bsp_aarch64 = " \ +WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \ ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ " SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE_mx8m ?= "imx-imx-boot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in" # Boot container built as a part of mainline U-Boot uses different WKS # file as the entire mx8m series, as U-Boot versions later than 2021.04 are @@ -462,19 +462,19 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" # replacement of imx-boot from NXP. # Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER # variable defined above. -SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-boot-container-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" SERIAL_CONSOLES = "115200;ttymxc0" -SERIAL_CONSOLES_mxs = "115200;ttyAMA0" +SERIAL_CONSOLES:mxs = "115200;ttyAMA0" KERNEL_IMAGETYPE = "zImage" -KERNEL_IMAGETYPE_aarch64 = "Image" +KERNEL_IMAGETYPE:aarch64 = "Image" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" # Add the ability to specify _imx machines MACHINEOVERRIDES =. "imx:" -HOSTTOOLS_NONFATAL_append_mx8 = " sha384sum" +HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum" diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index 2868b4d6..0cc980e8 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc @@ -6,10 +6,10 @@ require conf/machine/include/tune-cortexa35.inc IMX_DEFAULT_BSP = "nxp" MACHINE_FEATURES += "pci bcm43455 bcm4356" -MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" +MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" @@ -23,7 +23,7 @@ USE_VT = "0" KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ " diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index f458c56d..1295de1d 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -11,19 +11,19 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" # and pin it to NXP BSP only # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have # a full support for it yet. -MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359 qca9377" +MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 qca9377" KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ " UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" -IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" -IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" +IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" UBOOT_SUFFIX = "bin" @@ -51,18 +51,18 @@ SERIAL_CONSOLES = "115200;ttymxc1" # to be used to define the boot process. # We opt-in for Syslinux, since it is designated as a preferred # distro boot mode according to the U-Boot documentation. -UBOOT_EXTLINUX_use-mainline-bsp = "1" -UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default" -UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Mini EVK" +UBOOT_EXTLINUX:use-mainline-bsp = "1" +UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default" +UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Mini EVK" -UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Mini EVK" -UBOOT_EXTLINUX_FDT_default_use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" -UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}" -UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp = "root=/dev/mmcblk1p2" +UBOOT_EXTLINUX_MENU_DESCRIPTION_default:use-mainline-bsp = "i.MX8M Mini EVK" +UBOOT_EXTLINUX_FDT_default:use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" +UBOOT_EXTLINUX_CONSOLE_default:use-mainline-bsp = "console=${console}" +UBOOT_EXTLINUX_ROOT_default:use-mainline-bsp = "root=/dev/mmcblk1p2" # Add extlinux.conf to the lis of files, which are deployed onto the # boot partition -IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" +IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" LOADADDR = "" UBOOT_SUFFIX = "bin" @@ -73,4 +73,4 @@ OPTEE_BIN_EXT = "8mm" TEE_LOAD_ADDR = "0xbe000000" # Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" +MACHINE_FIRMWARE:append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index a0e39857..41100400 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -8,12 +8,12 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" # NXP BSP can consume proprietary jailhouse and Broadcom drivers # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have # a full support for it yet. -MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359" +MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359" KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ @@ -22,8 +22,8 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \ " UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" -IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" -IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" +IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" UBOOT_SUFFIX = "bin" @@ -52,18 +52,18 @@ SERIAL_CONSOLES = "115200;ttymxc1" # to be used to define the boot process. # We opt-in for Syslinux, since it is designated as a preferred # distro boot mode according to the U-Boot documentation. -UBOOT_EXTLINUX_use-mainline-bsp = "1" -UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default" -UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Nano EVK" +UBOOT_EXTLINUX:use-mainline-bsp = "1" +UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default" +UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Nano EVK" -UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Nano EVK" -UBOOT_EXTLINUX_FDT_default_use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" -UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}" -UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp = "root=/dev/mmcblk1p2" +UBOOT_EXTLINUX_MENU_DESCRIPTION_default:use-mainline-bsp = "i.MX8M Nano EVK" +UBOOT_EXTLINUX_FDT_default:use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" +UBOOT_EXTLINUX_CONSOLE_default:use-mainline-bsp = "console=${console}" +UBOOT_EXTLINUX_ROOT_default:use-mainline-bsp = "root=/dev/mmcblk1p2" # Add extlinux.conf to the lis of files, which are deployed onto the # boot partition -IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" +IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" BOOT_SPACE = "65536" LOADADDR = "" @@ -79,4 +79,4 @@ OPTEE_BIN_EXT = "8mn" TEE_LOAD_ADDR = "0x56000000" # Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" +MACHINE_FIRMWARE:append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index d070831f..bc2c038f 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc @@ -8,7 +8,7 @@ MACHINE_FEATURES += "pci wifi bluetooth" # NXP BSP can consume proprietary jailhouse and Marvell drivers # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have # a full support for it yet. -MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse mrvl8997" +MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997" # Mainline kernel contains only one DTB file for # imx8mpevk machine @@ -18,8 +18,8 @@ KERNEL_DEVICETREE = " \ UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" -IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" -IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" +IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc" UBOOT_SUFFIX = "bin" @@ -50,18 +50,18 @@ SERIAL_CONSOLES = "115200;ttymxc1" # to be used to define the boot process. # We opt-in for Syslinux, since it is designated as a preferred # distro boot mode according to the U-Boot documentation. -UBOOT_EXTLINUX_use-mainline-bsp = "1" -UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default" -UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Plus EVK" +UBOOT_EXTLINUX:use-mainline-bsp = "1" +UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default" +UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Plus EVK" -UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Plus EVK" -UBOOT_EXTLINUX_FDT_default_use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" -UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}" -UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp = "root=/dev/mmcblk1p2" +UBOOT_EXTLINUX_MENU_DESCRIPTION_default:use-mainline-bsp = "i.MX8M Plus EVK" +UBOOT_EXTLINUX_FDT_default:use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" +UBOOT_EXTLINUX_CONSOLE_default:use-mainline-bsp = "console=${console}" +UBOOT_EXTLINUX_ROOT_default:use-mainline-bsp = "root=/dev/mmcblk1p2" # Add extlinux.conf to the lis of files, which are deployed onto the # boot partition -IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" +IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" LOADADDR = "" UBOOT_SUFFIX = "bin" @@ -72,4 +72,4 @@ OPTEE_BIN_EXT = "8mp" TEE_LOAD_ADDR = "0x56000000" # Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" +MACHINE_FIRMWARE:append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 55a28c87..0bc10b8e 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc @@ -6,10 +6,10 @@ require conf/machine/include/tune-cortexa35.inc IMX_DEFAULT_BSP = "nxp" MACHINE_FEATURES += "pci optee bcm43455 bcm4356" -MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" +MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" @@ -23,7 +23,7 @@ USE_VT = "0" KERNEL_DEVICETREE = " \ freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ " -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ +KERNEL_DEVICETREE:append:use-nxp-bsp = " \ freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \ freescale/${KERNEL_DEVICETREE_BASENAME}-dsp.dtb \ @@ -71,4 +71,4 @@ IMXBOOT_TARGETS = \ BOARD_TYPE = "mek" # Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" +MACHINE_FIRMWARE:append = " linux-firmware-ath10k" diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 0a42160f..0d8978e3 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -9,8 +9,8 @@ PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-u-boot-tools" PREFERRED_VERSION_testfloat = "2a" SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz" -SOC_DEFAULT_IMAGE_FSTYPES_append_ls1043a = " wic.bz2" -SOC_DEFAULT_IMAGE_FSTYPES_append_ls1046a = " wic.bz2" +SOC_DEFAULT_IMAGE_FSTYPES:append:ls1043a = " wic.bz2" +SOC_DEFAULT_IMAGE_FSTYPES:append:ls1046a = " wic.bz2" IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" # Composite Image Layout (in KBytes) @@ -31,8 +31,8 @@ IMAGE_BOOT_FILES ?= " \ " SOC_DEFAULT_WKS_FILE ?= "" -SOC_DEFAULT_WKS_FILE_ls1043a ?= "ls104x-uboot-bootpart.wks.in" -SOC_DEFAULT_WKS_FILE_ls1046a ?= "ls104x-uboot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:ls1043a ?= "ls104x-uboot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE:ls1046a ?= "ls104x-uboot-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" @@ -54,7 +54,7 @@ MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:" # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" -MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq" +MACHINE_SOCARCH_SUFFIX:qoriq = "-qoriq" MACHINE_ARCH_FILTER = "virtual/kernel" diff --git a/conf/machine/include/utilities.inc b/conf/machine/include/utilities.inc index f11b588b..34ce7abc 100644 --- a/conf/machine/include/utilities.inc +++ b/conf/machine/include/utilities.inc @@ -23,6 +23,6 @@ def make_dtb_boot_files(d): def get_spl_binary(d): imx_default_bootloader = d.get('IMX_DEFAULT_BOOTLOADER') - spl_binary = d.getVar("SPL_BINARY_pn-%s" % imx_default_bootloader) + spl_binary = d.getVar("SPL_BINARY:pn-%s" % imx_default_bootloader) return spl_binary or "" diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf index 63f3802f..d70a5a61 100644 --- a/conf/machine/ls1028ardb.conf +++ b/conf/machine/ls1028ardb.conf @@ -22,7 +22,7 @@ UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig" UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig" KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb" -KERNEL_DEVICETREE_append_use-nxp-bsp = "\ +KERNEL_DEVICETREE:append:use-nxp-bsp = "\ freescale/fsl-ls1028a-rdb-dpdk.dtb \ " KERNEL_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf index fa8ab615..4ff3c0ac 100644 --- a/conf/machine/ls1043ardb.conf +++ b/conf/machine/ls1043ardb.conf @@ -27,7 +27,7 @@ KERNEL_DEVICETREE ?= "\ freescale/fsl-ls1043a-qds.dtb \ " # usdpaa dtb is used for dpdk. TODO: rename in kernel -KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\ +KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\ freescale/fsl-ls1043a-rdb-sdk.dtb \ freescale/fsl-ls1043a-rdb-usdpaa.dtb \ freescale/fsl-ls1043a-qds-sdk.dtb \ diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf index e6eabc0f..eb3c0bb6 100644 --- a/conf/machine/ls1046afrwy.conf +++ b/conf/machine/ls1046afrwy.conf @@ -25,7 +25,7 @@ KERNEL_DEVICETREE ?= "\ freescale/fsl-ls1046a-frwy.dtb \ " # usdpaa dtb is used for dpdk. TODO: rename in kernel -KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\ +KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\ freescale/fsl-ls1046a-frwy-sdk.dtb \ freescale/fsl-ls1046a-frwy-usdpaa.dtb \ " diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index 97fb1e29..8e815295 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf @@ -26,7 +26,7 @@ KERNEL_DEVICETREE ?= "\ freescale/fsl-ls1046a-qds.dtb \ " # usdpaa dtb is used for dpdk. TODO: rename in kernel -KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\ +KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\ freescale/fsl-ls1046a-rdb-sdk.dtb \ freescale/fsl-ls1046a-rdb-usdpaa.dtb \ freescale/fsl-ls1046a-qds-sdk.dtb \ |