summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-05-19 17:55:07 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-05-20 18:32:34 +0200
commit5b2ea09fcb3ff87269441711d5733377ddf9c1b6 (patch)
tree733c5dd620121ba8989da891e894e500920cff09
parenta273350f8c8b2d5c35e51aad186b04331fb2e7e5 (diff)
machines: provide a machine name string
Provide the MACHINE_NAME variable which can be e.g. used as part of the image name. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/machine/apalis-imx6-mainline.conf3
-rw-r--r--conf/machine/apalis-imx8.conf2
-rw-r--r--conf/machine/apalis-imx8a0.conf1
-rw-r--r--conf/machine/colibri-imx6-mainline.conf3
-rw-r--r--conf/machine/colibri-imx8qxp.conf2
-rw-r--r--conf/machine/include/apalis-imx6.inc2
-rw-r--r--conf/machine/include/colibri-imx6.inc2
-rw-r--r--conf/machine/include/colibri-imx6ull.inc2
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc2
-rw-r--r--conf/machine/include/colibri-imx7.inc2
10 files changed, 19 insertions, 2 deletions
diff --git a/conf/machine/apalis-imx6-mainline.conf b/conf/machine/apalis-imx6-mainline.conf
index a8074db..9618d0f 100644
--- a/conf/machine/apalis-imx6-mainline.conf
+++ b/conf/machine/apalis-imx6-mainline.conf
@@ -1,4 +1,5 @@
MACHINEOVERRIDES .= ":apalis-imx6:use-mainline-bsp"
require conf/machine/apalis-imx6.conf
include conf/machine/include/apalis-imx6.inc
-UBOOT_SUFFIX_use-mainline-bsp = "img" \ No newline at end of file
+MACHINE_NAME = "Apalis-iMX6-Mainline"
+UBOOT_SUFFIX_use-mainline-bsp = "img"
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index ad6b781..4ae9f8f 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -3,6 +3,8 @@
#@DESCRIPTION: Apalis iMX8 powered by a i.MX 8QuadMax SoC
#@MAINTAINER: Stefan Agner <stefan.agner@toradex.com>
+MACHINE_NAME = "Apalis-iMX8"
+
SOC_SILICON_REV ?= ""
MACHINEOVERRIDES =. "mx8:mx8qm:${@bb.utils.contains('SOC_SILICON_REV', 'a0', 'mx8qma0:', '', d)}"
diff --git a/conf/machine/apalis-imx8a0.conf b/conf/machine/apalis-imx8a0.conf
index e50d2da..4bffef6 100644
--- a/conf/machine/apalis-imx8a0.conf
+++ b/conf/machine/apalis-imx8a0.conf
@@ -2,3 +2,4 @@ SOC_SILICON_REV = "a0"
MACHINEOVERRIDES .= ":apalis-imx8"
require conf/machine/apalis-imx8.conf
+MACHINE_NAME = "Apalis-iMX8-A0"
diff --git a/conf/machine/colibri-imx6-mainline.conf b/conf/machine/colibri-imx6-mainline.conf
index 19748c6..181cc53 100644
--- a/conf/machine/colibri-imx6-mainline.conf
+++ b/conf/machine/colibri-imx6-mainline.conf
@@ -1,4 +1,5 @@
MACHINEOVERRIDES .= ":colibri-imx6:use-mainline-bsp"
require conf/machine/colibri-imx6.conf
require conf/machine/include/colibri-imx6.inc
-UBOOT_SUFFIX_use-mainline-bsp = "img" \ No newline at end of file
+MACHINE_NAME = "Colibri-iMX6-Mainline"
+UBOOT_SUFFIX_use-mainline-bsp = "img"
diff --git a/conf/machine/colibri-imx8qxp.conf b/conf/machine/colibri-imx8qxp.conf
index 858c9f0..ae67498 100644
--- a/conf/machine/colibri-imx8qxp.conf
+++ b/conf/machine/colibri-imx8qxp.conf
@@ -3,6 +3,8 @@
#@DESCRIPTION: Colibri iMX8QXP powered by a i.MX 8QXP SoC
#@MAINTAINER: Max Krummenacher <max.krummenacherr@toradex.com>
+MACHINE_NAME = "Colibri-iMX8QXP"
+
MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
require conf/machine/include/imx-base.inc
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index bb87263..26cb033 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -5,6 +5,8 @@ TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
OFFSET_BOOTROM_PAYLOAD = "2"
OFFSET_SPL_PAYLOAD = "138"
+MACHINE_NAME = "Apalis-iMX6"
+
KERNEL_DEVICETREE_remove = "imx6q-apalis_v1_0-eval.dtb imx6q-apalis_v1_0-ixora.dtb"
KERNEL_IMAGETYPE_${MACHINE} = "zImage"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 2ed7bf3..927506f 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -5,6 +5,8 @@ TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
OFFSET_BOOTROM_PAYLOAD = "2"
OFFSET_SPL_PAYLOAD = "138"
+MACHINE_NAME = "Colibri-iMX6"
+
KERNEL_IMAGETYPE_${MACHINE} = "zImage"
UBOOT_SUFFIX = "img"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index ed60b6d..00566b7 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -7,4 +7,6 @@ TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb"
TORADEX_FLASH_TYPE = "rawnand"
+MACHINE_NAME = "Colibri-iMX6ULL"
+
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 89d7dab..c32562d 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -5,6 +5,8 @@ OFFSET_BOOTROM_PAYLOAD = "2"
TORADEX_PRODUCT_IDS = "0039"
TORADEX_FLASH_TYPE = "emmc"
+MACHINE_NAME = "Colibri-iMX7-eMMC"
+
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index dcd8048..9976b69 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -6,6 +6,8 @@ TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0041] = "imx7d-colibri-eval-v3.dtb"
TORADEX_FLASH_TYPE = "rawnand"
+MACHINE_NAME = "Colibri-iMX7"
+
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"