summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Wesp <n.wesp@phytec.de>2019-07-17 11:51:35 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-07-17 13:19:17 (GMT)
commitbf2ae3ca2e2c1f4752eb7d961b9b37b3dbf806ad (patch)
treeface28e9e198c12d69be4b0f90d6aafce553bcde
parent359493844699b9f7144bd38d0620dfae16975a1a (diff)
downloadmeta-phytec-morty.zip
meta-phytec-morty.tar.bz2
kernel/barebox/u-boot: Fix COMPATIBLE_MACHINE expressionsmorty
COMPATIBLE_MACHINE is matched as regular expression. Thus phyflex-imx6-1 matches phyflex-imx6-1 but also phyflex-imx6-11, phyflex-imx6-12 and so forth. In kernel, barebox and u-boot recipes we only want to match the exact machine. Surround the COMPATIBLE_MACHINE expressions with '^(' at the beginning and with ')$' at the end to achieve this. Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de> Signed-off-by: Norbert Wesp <n.wesp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--classes/phygittag.bbclass4
-rw-r--r--recipes-bsp/barebox/barebox_2016.07.0-phy5.bb4
-rw-r--r--recipes-bsp/barebox/barebox_2016.11.0-phy4.bb4
-rw-r--r--recipes-bsp/barebox/barebox_2017.04.0-phy3.bb4
-rw-r--r--recipes-bsp/barebox/barebox_2017.06.1-phy4.bb4
-rw-r--r--recipes-bsp/u-boot/u-boot-imx_2017.03-imx8mq-phy3.bb5
-rw-r--r--recipes-bsp/u-boot/u-boot-imx_2017.03-imx8qm-phy1.bb5
-rw-r--r--recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb4
-rw-r--r--recipes-kernel/linux/linux-imx_4.1.15-phy3.bb4
-rw-r--r--recipes-kernel/linux/linux-imx_4.9.51-imx8mq-phy2.bb4
-rw-r--r--recipes-kernel/linux/linux-imx_4.9.51-imx8qm-phy1.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb5
-rw-r--r--recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.8-phy1.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb4
-rw-r--r--recipes-kernel/linux/linux-ti_4.4.141-phy2.bb4
-rw-r--r--recipes-kernel/linux/linux-vanilla_4.12.8.bb4
17 files changed, 54 insertions, 17 deletions
diff --git a/classes/phygittag.bbclass b/classes/phygittag.bbclass
index 322f526..44945fa 100644
--- a/classes/phygittag.bbclass
+++ b/classes/phygittag.bbclass
@@ -41,13 +41,15 @@
# # NOTE: Keep version in filename in sync with commit id!
# SRCREV = "57b87aedbf0b6ae0eb0b858dd0c83411097c777a"
#
-# COMPATIBLE_MACHINE = "phyflex-imx6-1"
+# COMPATIBLE_MACHINE = "^("
+# COMPATIBLE_MACHINE .= "phyflex-imx6-1"
# COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
# COMPATIBLE_MACHINE .= "|phycard-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-alcor-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-2"
+# COMPATIBLE_MACHINE .= ")$"
#
# External assumptions and constraints:
#
diff --git a/recipes-bsp/barebox/barebox_2016.07.0-phy5.bb b/recipes-bsp/barebox/barebox_2016.07.0-phy5.bb
index c081d5c..7d0915e 100644
--- a/recipes-bsp/barebox/barebox_2016.07.0-phy5.bb
+++ b/recipes-bsp/barebox/barebox_2016.07.0-phy5.bb
@@ -89,4 +89,6 @@ python do_env_append_phycore-rk3288-3() {
""")
}
-COMPATIBLE_MACHINE = "phycore-rk3288-3"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb b/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb
index cc9f9a7..cb28d0e 100644
--- a/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb
+++ b/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb
@@ -534,7 +534,8 @@ of_fixup_status /soc/aips-bus@02000000/pwm@02088000/
""")
}
-COMPATIBLE_MACHINE = "phyflex-imx6-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyflex-imx6-1"
COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
COMPATIBLE_MACHINE .= "|phyflex-imx6-3"
COMPATIBLE_MACHINE .= "|phyflex-imx6-4"
@@ -564,3 +565,4 @@ COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-12"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-13"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/barebox/barebox_2017.04.0-phy3.bb b/recipes-bsp/barebox/barebox_2017.04.0-phy3.bb
index b016659..04c6238 100644
--- a/recipes-bsp/barebox/barebox_2017.04.0-phy3.bb
+++ b/recipes-bsp/barebox/barebox_2017.04.0-phy3.bb
@@ -214,7 +214,9 @@ python do_env_append_phyboard-segin-imx6ul-5() {
""")
}
-COMPATIBLE_MACHINE = "phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-segin-imx6ul-2"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-3"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-4"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-5"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/barebox/barebox_2017.06.1-phy4.bb b/recipes-bsp/barebox/barebox_2017.06.1-phy4.bb
index 3c9ef1c..e8e3ca6 100644
--- a/recipes-bsp/barebox/barebox_2017.06.1-phy4.bb
+++ b/recipes-bsp/barebox/barebox_2017.06.1-phy4.bb
@@ -221,7 +221,8 @@ global.linux.bootargs.dyn.root="root=/dev/mmcblk1p2 rootflags='data=journal'"
""")
}
-COMPATIBLE_MACHINE = "beagleboneblack-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "beagleboneblack-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-2"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-3"
@@ -241,3 +242,4 @@ COMPATIBLE_MACHINE .= "|phycore-r2-am335x-3"
COMPATIBLE_MACHINE .= "|phycore-r2-am335x-4"
COMPATIBLE_MACHINE .= "|phycore-r2-am335x-5"
COMPATIBLE_MACHINE .= "|phycore-emmc-am335x-1"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8mq-phy3.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8mq-phy3.bb
index 7c1b0a0..334bb10 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8mq-phy3.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8mq-phy3.bb
@@ -47,6 +47,9 @@ do_deploy_append_mx8mq () {
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "phyboard-polaris-imx8m-2"
+
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-polaris-imx8m-2"
+COMPATIBLE_MACHINE .= ")$"
UBOOT_NAME_mx8 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8qm-phy1.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8qm-phy1.bb
index 1b85c1e..785a4c0 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8qm-phy1.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2017.03-imx8qm-phy1.bb
@@ -21,6 +21,9 @@ S = "${WORKDIR}/git"
BOOT_TOOLS = "imx-boot-tools"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "phycore-imx8-1"
+
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycore-imx8-1"
+COMPATIBLE_MACHINE .= ")$"
UBOOT_NAME_mx8 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
diff --git a/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb b/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb
index 134268e..5b0937f 100644
--- a/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb
+++ b/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb
@@ -18,7 +18,9 @@ SRC_URI += " file://0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.pa
PR = "r0"
-COMPATIBLE_MACHINE = "phycore-rk3288-3"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"
UBOOT_SUFFIX = "img"
UBOOT_BINARY = "u-boot-dtb.${UBOOT_SUFFIX}"
diff --git a/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb b/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb
index a1256d9..0c89940 100644
--- a/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb
+++ b/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb
@@ -18,7 +18,9 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "imx_v7_defconfig"
-COMPATIBLE_MACHINE = "phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-segin-imx6ul-2"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-3"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-4"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-5"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-imx_4.9.51-imx8mq-phy2.bb b/recipes-kernel/linux/linux-imx_4.9.51-imx8mq-phy2.bb
index c4283ec..28b3c2a 100644
--- a/recipes-kernel/linux/linux-imx_4.9.51-imx8mq-phy2.bb
+++ b/recipes-kernel/linux/linux-imx_4.9.51-imx8mq-phy2.bb
@@ -19,4 +19,6 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "defconfig"
-COMPATIBLE_MACHINE = "phyboard-polaris-imx8m-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-polaris-imx8m-2"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-imx_4.9.51-imx8qm-phy1.bb b/recipes-kernel/linux/linux-imx_4.9.51-imx8qm-phy1.bb
index 46aaac8..65f2bc0 100644
--- a/recipes-kernel/linux/linux-imx_4.9.51-imx8qm-phy1.bb
+++ b/recipes-kernel/linux/linux-imx_4.9.51-imx8qm-phy1.bb
@@ -18,4 +18,6 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "defconfig"
-COMPATIBLE_MACHINE = "phycore-imx8-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycore-imx8-1"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb b/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb
index 67c32ed..8a269c2 100644
--- a/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb
+++ b/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb
@@ -16,7 +16,8 @@ SRCREV = "2daddfb77a87b8353fdd06ce548c5ae8ca5f9c0a"
S = "${WORKDIR}/git"
-COMPATIBLE_MACHINE = "phyflex-imx6-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyflex-imx6-1"
COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
COMPATIBLE_MACHINE .= "|phyflex-imx6-3"
COMPATIBLE_MACHINE .= "|phyflex-imx6-4"
@@ -44,6 +45,8 @@ COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-10"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-11"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-12"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-13"
+COMPATIBLE_MACHINE .= ")$"
+
SRC_URI_append_phyboard-mira-imx6-13 = " \
file://0001-mira-peb-eval-01-mux-gpios-and-do-not-load-driver.patch \
file://0002-phycore-som-add-spi-port-on-the-expansion-connector.patch \
diff --git a/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb b/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb
index a8b3ff0..c16e961 100644
--- a/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb
+++ b/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb
@@ -16,6 +16,8 @@ SRCREV = "81a09e4ca6c2c6f1138c4cc117cd8572f852ee68"
S = "${WORKDIR}/git"
-COMPATIBLE_MACHINE = "phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-segin-imx6ul-2"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-3"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-4"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.8-phy1.bb b/recipes-kernel/linux/linux-mainline_4.8-phy1.bb
index 7dd06de..272a790 100644
--- a/recipes-kernel/linux/linux-mainline_4.8-phy1.bb
+++ b/recipes-kernel/linux/linux-mainline_4.8-phy1.bb
@@ -16,5 +16,7 @@ SRCREV = "eaa22a23edd09f12aafb6a9e0bc3353632250f49"
S = "${WORKDIR}/git"
-COMPATIBLE_MACHINE = "phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-segin-imx6ul-2"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-3"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb b/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb
index babb3e6..c5f12e0 100644
--- a/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb
+++ b/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb
@@ -18,4 +18,6 @@ SRCREV = "e2deb7324ab4c66a35edc2fe6805b250a215940f"
S = "${WORKDIR}/git"
-COMPATIBLE_MACHINE = "phycore-rk3288-3"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-ti_4.4.141-phy2.bb b/recipes-kernel/linux/linux-ti_4.4.141-phy2.bb
index c1bfb30..40061c4 100644
--- a/recipes-kernel/linux/linux-ti_4.4.141-phy2.bb
+++ b/recipes-kernel/linux/linux-ti_4.4.141-phy2.bb
@@ -30,7 +30,8 @@ RDEPENDS_kernel-modules_ti33x = "\
cryptodev-module \
"
-COMPATIBLE_MACHINE = "beagleboneblack-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "beagleboneblack-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-2"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-3"
@@ -50,3 +51,4 @@ COMPATIBLE_MACHINE .= "|phycore-r2-am335x-3"
COMPATIBLE_MACHINE .= "|phycore-r2-am335x-4"
COMPATIBLE_MACHINE .= "|phycore-r2-am335x-5"
COMPATIBLE_MACHINE .= "|phycore-emmc-am335x-1"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-vanilla_4.12.8.bb b/recipes-kernel/linux/linux-vanilla_4.12.8.bb
index 198afa9..1c22912 100644
--- a/recipes-kernel/linux/linux-vanilla_4.12.8.bb
+++ b/recipes-kernel/linux/linux-vanilla_4.12.8.bb
@@ -19,7 +19,9 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "multi_v7_defconfig"
-COMPATIBLE_MACHINE = "phyboard-wega-am335x-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-wega-am335x-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-2"
COMPATIBLE_MACHINE .= "|phycore-am335x-1"
COMPATIBLE_MACHINE .= "|phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"