From 74498c1ca35dcb66fd51fe02dac0a6db9959fc5c Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Thu, 21 Mar 2024 10:20:07 +0100
Subject: [PATCH] [INTEL] Add "intel" generic machine handling
* From now on, the compiled image for all Intel CPU-based SECO boards
will be unique and not separate for different processor generations/flavours.
* Bump of the kernel version for all Intel architectures to rel. 6.1.
* Set KERNEL variable separately for each board and avoid the
override of the value set in the generic yocto variables.
---
build-pipeline-yocto.yml.jinja2 | 35 +++++++++++++++++++++++++++++++++
manifest-pipeline-yocto.yml | 1 -
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index 1797eab..f2b8216 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -71,56 +71,66 @@ release:
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_q7_928_edgehog" %}
{% set BUILD_DIR = "build_928" %}
+ {% set KERNEL = "5-10-x" %}
{% elif '962' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_uq7_962_edgehog" %}
{% set BUILD_DIR = "build_962" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'a62' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_sbc_a62_edgehog" %}
{% set BUILD_DIR = "build_a62" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'a75' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6qdl-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_uq7_a75_edgehog" %}
{% set BUILD_DIR = "build_a75" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'b08' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6sx-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_sbc_b08_edgehog" %}
{% set BUILD_DIR = "build_b08" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c23' in machine %}
{% set PROCESSOR = "imx6" %}
{% set RAM_CONF = machine.split('-')[-1] %}
{% set MACHINE = "seco-imx6sx-" + machine.split('-')[0] %}
{% set DEFCONFIG = "seco_sbc_c23_edgehog" %}
{% set BUILD_DIR = "build_c23" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c12' in machine %}
{% set PROCESSOR = "imx8mq" %}
{% set MACHINE = "seco-imx8mq-" + machine %}
{% set DEFCONFIG = "seco_smarc_c12_edgehog" %}
{% set BUILD_DIR = "build_c12" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c20' in machine %}
{% set PROCESSOR = "imx8mq" %}
{% set MACHINE = "seco-imx8mq-" + machine %}
{% set DEFCONFIG = "seco_sbc_c20_edgehog" %}
{% set BUILD_DIR = "build_c20" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c25' in machine %}
{% set PROCESSOR = "imx8mq" %}
{% set MACHINE = "seco-imx8mq-" + machine %}
{% set DEFCONFIG = "seco_q7_c25_edgehog" %}
{% set BUILD_DIR = "build_c25" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c26' in machine %}
{% set PROCESSOR = "imx8qm" %}
{% set MACHINE = "seco-imx8qm-" + machine %}
{% set DEFCONFIG = "seco_q7_c26_edgehog" %}
{% set BUILD_DIR = "build_c26" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c31' in machine %}
{% set PROCESSOR = "rk3399" %}
{% set MACHINE = "seco-rk3399-" + machine %}
@@ -132,96 +142,121 @@ release:
{% set MACHINE = "seco-imx8qm-" + machine %}
{% set DEFCONFIG = "seco_sbc_c43_edgehog" %}
{% set BUILD_DIR = "build_c43" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c57' in machine %}
{% set PROCESSOR = "imx8x" %}
{% set MACHINE = "seco-imx8x-" + machine %}
{% set DEFCONFIG = "seco_sbc_c57_edgehog" %}
{% set BUILD_DIR = "build_c57" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c58' in machine %}
{% set PROCESSOR = "imx8x" %}
{% set MACHINE = "seco-imx8x-" + machine %}
{% set DEFCONFIG = "seco_q7_c58_edgehog" %}
{% set BUILD_DIR = "build_c58" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c61' in machine %}
{% set PROCESSOR = "imx8mm" %}
{% set MACHINE = "seco-imx8mm-" + machine %}
{% set DEFCONFIG = "seco_sbc_c61_edgehog" %}
{% set BUILD_DIR = "build_c61" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c72n' in machine %}
{% set PROCESSOR = "imx8mn" %}
{% set MACHINE = "seco-imx8mn-c72" %}
{% set DEFCONFIG = "seco_q7_c72n_edgehog" %}
{% set BUILD_DIR = "build_c72n" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c72nl' in machine %}
{% set PROCESSOR = "imx8mnl" %}
{% set MACHINE = "seco-imx8mnl-c72" %}
{% set DEFCONFIG = "seco_q7_c72nl_edgehog" %}
{% set BUILD_DIR = "build_c72nl" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'c72m' in machine %}
{% set PROCESSOR = "imx8mm" %}
{% set MACHINE = "seco-imx8mm-c72" %}
{% set DEFCONFIG = "seco_q7_c72m_edgehog" %}
{% set BUILD_DIR = "build_c72m" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'd16' in machine %}
{% set PROCESSOR = "imx8x" %}
{% set MACHINE = "seco-imx8x-" + machine %}
{% set DEFCONFIG = "seco_smarc_d16_edgehog" %}
{% set BUILD_DIR = "build_d16" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'd18' in machine %}
{% set PROCESSOR = "imx8mp" %}
{% set MACHINE = "seco-imx8mp-" + machine %}
{% set DEFCONFIG = "seco_smarc_d18_edgehog" %}
{% set BUILD_DIR = "build_d18" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'd23' in machine %}
{% set PROCESSOR = "px30" %}
{% set MACHINE = "seco-px30-" + machine %}
{% set DEFCONFIG = "seco_sbc_d23_edgehog" %}
{% set BUILD_DIR = "build_d23" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'e09' in machine %}
{% set PROCESSOR = "rk3568" %}
{% set MACHINE = "seco-rk3568-" + machine %}
{% set DEFCONFIG = "seco_sbc_e09_edgehog" %}
{% set BUILD_DIR = "build_e09" %}
+ {% set KERNEL = "5-10-x" %}
{% elif 'tanaro' in machine %}
{% set PROCESSOR = "imx8mm" %}
{% set MACHINE = "seco-imx8mm-" + machine %}
{% set DEFCONFIG = "seco_sbc_tanaro_edgehog" %}
{% set BUILD_DIR = "build_tanaro" %}
+ {% set KERNEL = "5-10-x" %}
+ {% elif 'intel' in machine %}
+ {% set PROCESSOR = "intel" %}
+ {% set MACHINE = "seco-" + PROCESSOR %}
+ {% set DEFCONFIG = "seco_intel_edgehog" %}
+ {% set BUILD_DIR = "build_intel" %}
+ {% set KERNEL = "6-1-x" %}
{% elif 'apollolake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-apl" %}
{% set DEFCONFIG = "seco_intel_apl_edgehog" %}
{% set BUILD_DIR = "build_intel_apl" %}
+ {% set KERNEL = "6-1-x" %}
{% elif 'tigerlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-tgl" %}
{% set DEFCONFIG = "seco_intel_tgl_edgehog" %}
{% set BUILD_DIR = "build_intel_tgl" %}
+ {% set KERNEL = "6-1-x" %}
{% elif 'elkhartlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-ehl" %}
{% set DEFCONFIG = "seco_intel_ehl_edgehog" %}
{% set BUILD_DIR = "build_intel_ehl" %}
+ {% set KERNEL = "6-1-x" %}
{% elif 'coffeelake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-cfl" %}
{% set DEFCONFIG = "seco_intel_cfl_edgehog" %}
{% set BUILD_DIR = "build_intel_cfl" %}
+ {% set KERNEL = "6-1-x" %}
{% elif 'whiskeylake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-wkl" %}
{% set DEFCONFIG = "seco_intel_wkl_edgehog" %}
{% set BUILD_DIR = "build_intel_wkl" %}
+ {% set KERNEL = "6-1-x" %}
{% elif 'alderlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-adl" %}
{% set DEFCONFIG = "seco_intel_adl_edgehog" %}
{% set BUILD_DIR = "build_intel_adl" %}
+ {% set KERNEL = "6-1-x" %}
{% elif 'raptorlake' in machine %}
{% set PROCESSOR = "intel" %}
{% set MACHINE = "seco-" + PROCESSOR + "-rpl" %}
{% set DEFCONFIG = "seco_intel_rpl_edgehog" %}
{% set BUILD_DIR = "build_intel_rpl" %}
+ {% set KERNEL = "6-1-x" %}
{% endif %}
{% if PROCESSOR == 'imx6' %}
{% set UBOOT_FILE = "u-boot.imx" %}
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 343b877..e09a2c6 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -26,7 +26,6 @@ variables:
edgehog/layers/external/poky
IMAGES_PATH: "tmp/deploy/images"
TAG_NAME: weekly
- KERNEL: 5-10-x
GIT_SSL_NO_VERIFY: 1
FS_EXTENSION: rootfs.tar.bz2
IMAGE_EXTENSION: wic.bz2
--
GitLab