From d903fd11d6023c646edf09c1a31ad2e55480020b Mon Sep 17 00:00:00 2001
From: Catalin Iova <Catalin.Iova@enea.com>
Date: Fri, 26 Nov 2021 05:52:56 +0100
Subject: recipes: Add support for lx2160

Change-Id: I5ed1de25386032c9a28beb3ea605aff3f9325dba
Signed-off-by: Catalin Iova <Catalin.Iova@enea.com>
---
 conf/layer.conf                               |  4 +++-
 conf/machine/enea_lx2160ardb.conf             | 22 ++++++++++++++++++++++
 recipes-core/ovmf/ovmf_git.bbappend           |  5 +++--
 recipes-devtools/syslinux/syslinux_%.bbappend |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 conf/machine/enea_lx2160ardb.conf

diff --git a/conf/layer.conf b/conf/layer.conf
index 50199be..fc3130d 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,5 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "nfv-access-bsp-arm"
 BBFILE_PATTERN_nfv-access-bsp-arm = "^${LAYERDIR}/"
-BBFILE_PRIORITY_nfv-access-bsp-arm = "6"
+LAYERSERIES_COMPAT_nfv-access-bsp-arm = "hardknott"
 LAYERDEPENDS_nfv-access-bsp-arm = "nfv-access-bsp-common"
+
+include conf/machine/enea_lx2160ardb.conf
diff --git a/conf/machine/enea_lx2160ardb.conf b/conf/machine/enea_lx2160ardb.conf
new file mode 100644
index 0000000..c2acf45
--- /dev/null
+++ b/conf/machine/enea_lx2160ardb.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: xeon-d
+#@SUMMARY: Intel Xeon D1521
+#@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
+
+# This is a clean-up version of conf/machine/intel-corei7-64.conf
+# If the configuration need to be updated please check first the original .conf
+
+MACHINE_FEATURES_remove_lx2160ardb = "pcbios"
+MACHINE_FEATURES_append_lx2160ardb = " efi"
+
+WKS_FILE_DEPENDS_BOOTLOADERS_aarch64 = "grub-efi systemd-boot"
+
+PREFERRED_PROVIDER_qemu_lx2160ardb ?= "qemu-qoriq"
+PREFERRED_PROVIDER_qemu-dev_lx2160ardb ?= "qemu-qoriq"
+
+EXTRA_IMAGEDEPENDS_remove_lx2160ardb = "u-boot"
+EXTRA_IMAGEDEPENDS_remove_lx2160ardb = "qoriq-atf"
+
+SOTA_MACHINE_lx2160ardb = "${MACHINE}"
+
+KERNEL_DEVICETREE_remove_lx2160ardb = "freescale/fsl-lx2160a-rdb.dtb freescale/fsl-lx2160a-qds.dtb"
diff --git a/recipes-core/ovmf/ovmf_git.bbappend b/recipes-core/ovmf/ovmf_git.bbappend
index 9fc7cb7..54507ca 100644
--- a/recipes-core/ovmf/ovmf_git.bbappend
+++ b/recipes-core/ovmf/ovmf_git.bbappend
@@ -1,10 +1,10 @@
 # Overwrite the "do_compile" step in order to support AARCH64 targets.
 
-COMPATIBLE_HOST='(i.86|x86_64|aarch64).*'
+COMPATIBLE_HOST_class-target='(i.86|x86_64|aarch64).*'
 
 do_compile_class-target() {
     export LFLAGS="${LDFLAGS}"
-    PARALLEL_JOBS="${@ '${PARALLEL_MAKE}'.replace('-j', '-n ')}"
+    PARALLEL_JOBS="${@oe.utils.parallel_make_argument(d, '-n %d')}"
     OVMF_ARCH="X64"
     if [ "${TARGET_ARCH}" != "x86_64" ] ; then
         OVMF_ARCH="IA32"
@@ -110,3 +110,4 @@ do_deploy_class-target() {
         done
     fi
 }
+
diff --git a/recipes-devtools/syslinux/syslinux_%.bbappend b/recipes-devtools/syslinux/syslinux_%.bbappend
index 045830a..a5a7216 100644
--- a/recipes-devtools/syslinux/syslinux_%.bbappend
+++ b/recipes-devtools/syslinux/syslinux_%.bbappend
@@ -1,7 +1,7 @@
 # Syslinux is not supposed to be available on ARM.
 # Some recipes/image-classes mark it as a dependency even if it's not used.
 
-COMPATIBLE_HOST = '(x86_64|i.86|aarch64).*-(linux|freebsd.*)'
+COMPATIBLE_HOST_class-target = '(x86_64|i.86|aarch64|arm64).*-(linux|freebsd.*)'
 
 do_fetch[noexec] = "1"
 do_unpack[noexec] = "1"
-- 
cgit v1.2.3-54-g00ecf