From 2f2d57f9a3a856345aa5d016cbe7f542a817aa37 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Mon, 17 Apr 2023 14:57:09 +0200
Subject: [PATCH] [INTEL] Integration of Elkhart Lake architecture

* Include config file for Elkhart Lake Intel processor
* Include embedded jobs also for Intel Apollo Lake processor
* Minor fix in check artifacts task
---
 boards/.intel_apl.yml            | 44 ++++++++++++++++++++-
 boards/.intel_ehl.yml            | 67 ++++++++++++++++++++++++++++++++
 scripts/check_build_artifacts.sh |  4 +-
 3 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 boards/.intel_ehl.yml

diff --git a/boards/.intel_apl.yml b/boards/.intel_apl.yml
index 844f4a4..d04d5f2 100644
--- a/boards/.intel_apl.yml
+++ b/boards/.intel_apl.yml
@@ -7,7 +7,7 @@ build-edgehog-intel-apl:
   variables: &build-edgehog-intel-apl
      BOARD: apollolake
      PROCESSOR: intel
-     BUILD_DIRECTORY: build_intel
+     BUILD_DIRECTORY: build_intel_apl
      MACHINE: seco-intel-apl
      DEFCONFIG_FILE: seco_intel_apl_edgehog
      RECIPE_NAME: seco-image-edgehog
@@ -23,3 +23,45 @@ deploy-edgehog-intel-apl:
   variables: &deploy-edgehog-intel-apl
       <<: *build-edgehog-intel-apl
       AZURE_PATH: apollolake/Yocto
+
+#############################
+### EDGEHOG EMBEDDED BASE ###
+#############################
+
+build-edgehog-embedded-base-intel-apl:
+  extends: .build
+  variables: &build-edgehog-embedded-intel-apl
+     <<: *build-edgehog-intel-apl
+     RECIPE_NAME: seco-image-edgehog-base
+     BUILD_DIRECTORY: build_intel_apl_embedded_wayland
+     DEFCONFIG_FILE: seco_intel_apl_edgehog_embedded_wayland
+     IMAGE_NAME: edgehog-embedded-base-image
+    
+deploy-edgehog-embedded-base-intel-apl:
+  extends: .deploy
+  needs: 
+   - job: build-edgehog-embedded-base-intel-apl
+     artifacts: true
+  variables:
+      <<: *deploy-edgehog-intel-apl
+      <<: *build-edgehog-embedded-intel-apl
+
+#############################
+### EDGEHOG EMBEDDED FULL ###
+#############################
+
+build-edgehog-embedded-full-intel-apl:
+  extends: .build
+  variables: &build-edgehog-embedded-intel-apl-full
+     <<: *build-edgehog-embedded-intel-apl
+     RECIPE_NAME: seco-image-edgehog-full
+     IMAGE_NAME: edgehog-embedded-full-image
+    
+deploy-edgehog-embedded-full-intel-apl:
+  extends: .deploy
+  needs: 
+   - job: build-edgehog-embedded-full-intel-apl
+     artifacts: true
+  variables:
+      <<: *deploy-edgehog-intel-apl
+      <<: *build-edgehog-embedded-intel-apl-full
\ No newline at end of file
diff --git a/boards/.intel_ehl.yml b/boards/.intel_ehl.yml
new file mode 100644
index 0000000..fd90533
--- /dev/null
+++ b/boards/.intel_ehl.yml
@@ -0,0 +1,67 @@
+########################
+#### EDGEHOG THINGS ####
+########################
+
+build-edgehog-intel-ehl:
+  extends: .build
+  variables: &build-edgehog-intel-ehl
+     BOARD: elkhartlake
+     PROCESSOR: intel
+     BUILD_DIRECTORY: build_intel_ehl
+     MACHINE: seco-intel-ehl
+     DEFCONFIG_FILE: seco_intel_ehl_edgehog
+     RECIPE_NAME: seco-image-edgehog
+     IMAGE_NAME: edgehog-things-image
+     UBOOT_FILE: none
+     KERNEL_FILE: none
+    
+deploy-edgehog-intel-ehl:
+  extends: .deploy
+  needs: 
+   - job: build-edgehog-intel-ehl
+     artifacts: true
+  variables: &deploy-edgehog-intel-ehl
+      <<: *build-edgehog-intel-ehl
+      AZURE_PATH: elkhartlake/Yocto
+
+#############################
+### EDGEHOG EMBEDDED BASE ###
+#############################
+
+build-edgehog-embedded-base-intel-ehl:
+  extends: .build
+  variables: &build-edgehog-embedded-intel-ehl
+     <<: *build-edgehog-intel-ehl
+     RECIPE_NAME: seco-image-edgehog-base
+     BUILD_DIRECTORY: build_intel_ehl_embedded_wayland
+     DEFCONFIG_FILE: seco_intel_ehl_edgehog_embedded_wayland
+     IMAGE_NAME: edgehog-embedded-base-image
+    
+deploy-edgehog-embedded-base-intel-ehl:
+  extends: .deploy
+  needs: 
+   - job: build-edgehog-embedded-base-intel-ehl
+     artifacts: true
+  variables:
+      <<: *deploy-edgehog-intel-ehl
+      <<: *build-edgehog-embedded-intel-ehl
+
+#############################
+### EDGEHOG EMBEDDED FULL ###
+#############################
+
+build-edgehog-embedded-full-intel-ehl:
+  extends: .build
+  variables: &build-edgehog-embedded-intel-ehl-full
+     <<: *build-edgehog-embedded-intel-ehl
+     RECIPE_NAME: seco-image-edgehog-full
+     IMAGE_NAME: edgehog-embedded-full-image
+    
+deploy-edgehog-embedded-full-intel-ehl:
+  extends: .deploy
+  needs: 
+   - job: build-edgehog-embedded-full-intel-ehl
+     artifacts: true
+  variables:
+      <<: *deploy-edgehog-intel-ehl
+      <<: *build-edgehog-embedded-intel-ehl-full
\ No newline at end of file
diff --git a/scripts/check_build_artifacts.sh b/scripts/check_build_artifacts.sh
index 0e6386b..0aaabec 100755
--- a/scripts/check_build_artifacts.sh
+++ b/scripts/check_build_artifacts.sh
@@ -44,10 +44,10 @@ if [[ $KERNEL_FILE != *"none"* ]]; then
   fi
 
   if [ $count_dtbo -eq 0 ]; then
-    echo "No dtb artifacts were compiled, exiting with error 1 .."
+    echo "No dtbo artifacts were compiled, exiting with error 1 .."
     exit 1
   else
-    echo "dtb artifacts were found!"
+    echo "dtbo artifacts were found!"
   fi
 fi
 
-- 
GitLab