layer: convert to new override syntax

Fix the leftovers which the script didn't catch.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

7 files changed, 10 insertions, 10 deletions

diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index bcd4c9f..ec7e8ce 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -69,7 +69,7 @@ MACHINE_FIRMWARE:append = " firmware-imx-8"
 IMXBOOT_TARGETS = "flash_b0"
 IMX_BOOT_SOC_TARGET = "iMX8QM"
 
-PREFERRED_PROVIDER:imx-sc-firmware = "imx-sc-firmware-toradex"
+PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex"
 BOARD_TYPE = "apalis"
 
 IMAGE_CLASSES:append = " image_type_tezi"
diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf
index f82a222..df84fd6 100644
--- a/conf/machine/apalis-imx8x.conf
+++ b/conf/machine/apalis-imx8x.conf
@@ -61,7 +61,7 @@ MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
 IMXBOOT_TARGETS = "flash"
 IMX_BOOT_SOC_TARGET = "iMX8QX"
 
-PREFERRED_PROVIDER:imx-sc-firmware = "imx-sc-firmware-toradex"
+PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex"
 BOARD_TYPE = "apalis"
 
 IMAGE_CLASSES:append = " image_type_tezi"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index 5cd09b3..f4e29ec 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -68,7 +68,7 @@ MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
 IMXBOOT_TARGETS = "flash"
 IMX_BOOT_SOC_TARGET = "iMX8QX"
 
-PREFERRED_PROVIDER:imx-sc-firmware = "imx-sc-firmware-toradex"
+PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex"
 BOARD_TYPE = "colibri"
 
 IMAGE_CLASSES:append = " image_type_tezi"
diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend
index 61e7b22..7060815 100644
--- a/recipes-bsp/imx-atf/imx-atf_%.bbappend
+++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -1,5 +1,5 @@
 PV = "2.2+git${SRCPV}"
-SRCBRANCH = "toradex:imx_5.4.70_2.3.0"
+SRCBRANCH = "toradex_imx_5.4.70_2.3.0"
 SRCREV = "835a8f67b2ca7aa3f2d05d6e6a1a51f7e1147266"
 SRCREV_use-head-next = "${AUTOREV}"
 SRC_URI = "git://git.toradex.com/imx-atf.git;protocol=https;branch=${SRCBRANCH}"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
index f3c289f..39d3c28 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
@@ -12,7 +12,7 @@ SRC_URI = " \
 
 SRCREV = "f499632b31f88dbd313fe9f742e2019c56032558"
 SRCREV_use-head-next = "${AUTOREV}"
-SRCBRANCH = "toradex:imx_v2020.04_5.4.70_2.3.0"
+SRCBRANCH = "toradex_imx_v2020.04_5.4.70_2.3.0"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
index e623486..7a72a34 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
@@ -10,8 +10,8 @@ DEPENDS += "bc-native dtc-native"
 # While NXP i.MX 7 downstream requires the Linux kernel to boot in secure
 # mode mainline/upstream requires non-secure mode instead, as it properly
 # uses PSCI to control further cores.
-SRC_URI:append:use-mainline-bsp:colibri-imx7 = " file://0001-colibri:imx7-boot-linux-kernel-in-non-secure-mode.patch"
-SRC_URI:append:use-mainline-bsp:colibri-imx7-emmc = " file://0001-colibri:imx7-boot-linux-kernel-in-non-secure-mode.patch"
+SRC_URI:append:use-mainline-bsp:colibri-imx7 = " file://0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch"
+SRC_URI:append:use-mainline-bsp:colibri-imx7-emmc = " file://0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch"
 
 BOOT_TOOLS = "imx-boot-tools"
 
diff --git a/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
index 58ae3f9..044b86e 100644
--- a/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
+++ b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
@@ -28,11 +28,11 @@ SRCREV_machine_use-head-next = "${AUTOREV}"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
 
-KBUILD_DEFCONFIG:apalis-imx6 ?= "apalis:imx6_defconfig"
-KBUILD_DEFCONFIG:colibri-imx6 ?= "colibri:imx6_defconfig"
+KBUILD_DEFCONFIG:apalis-imx6 ?= "apalis_imx6_defconfig"
+KBUILD_DEFCONFIG:colibri-imx6 ?= "colibri_imx6_defconfig"
 KBUILD_DEFCONFIG:colibri-imx6ull ?= "colibri-imx6ull_defconfig"
 KBUILD_DEFCONFIG:colibri-imx6ull-emmc ?= "colibri-imx6ull_defconfig"
-KBUILD_DEFCONFIG:mx7 ?= "colibri:imx7_defconfig"
+KBUILD_DEFCONFIG:mx7 ?= "colibri_imx7_defconfig"
 KBUILD_DEFCONFIG:mx8 ?= "toradex_defconfig"
 
 export DTC_FLAGS = "-@"