From c82336bb19d4a6462af8d00366118704aa73239e Mon Sep 17 00:00:00 2001
From: Adrian Stratulat <adrian.stratulat@enea.com>
Date: Tue, 16 Jun 2020 08:30:23 +0200
Subject: Ampere/aarch64 bring-up changes

* Refactor the efi-secure-boot feature (in order for it to be
disabled for certain targets)
* Add support for emag8180 compilation target (used as Enea NFV Access host)
* Add emag8180 support in ostree
* Add support for qemuarm64 compilation target (used as Enea NFV Access VNF)

Note:
The aarch64 family does not support the secure-boot feature yet, so the
"efi-secure-boot" has been disabled.

Change-Id: I32336761d322102a07d065c9ab02ea5051854609
Signed-off-by: Adrian Stratulat <adrian.stratulat@enea.com>
---
 images/enea-nfv-access-host-common.inc | 15 ++++++++++++++-
 images/enea-nfv-access-vnf.bb          |  1 +
 images/enea-nfv-access.bb              | 11 +++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'images')

diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc
index 1cde827..370a3a8 100644
--- a/images/enea-nfv-access-host-common.inc
+++ b/images/enea-nfv-access-host-common.inc
@@ -2,9 +2,15 @@ REQUIRE_FILES = " \
     images/enea-nfv-access-common.inc \
     classes/override_grub-efi.inc \
     "
-REQUIRE_FILES_append_df-efi-secure-boot = " \
+
+# override_image_types_ostree - has some secure-boot changes
+# but we guarded them
+REQUIRE_FILES_append_sota = " \
     classes/override_image_types_ostree.inc \
     classes/override_image_types_ota.inc \
+                       "
+
+REQUIRE_FILES_append_df-efi-secure-boot = " \
     classes/override_grub-efi_secureboot.inc \
     images/secure-boot.inc \
     "
@@ -20,14 +26,21 @@ IMAGE_INSTALL += " \
 LABELS_LIVE = "installer live-boot"
 
 GRUB_GFXSERIAL_x86-64 = "1"
+GRUB_GFXSERIAL_aarch64 = "1"
+GRUB_SERIAL_aarch64 = "console=ttyAMA0,115200"
+
 # Append default parameters for x86-64 targets
 APPEND_x86-64 = "quiet"
 SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=ttyS0,115200"
 
+APPEND_aarch64 = "quiet"
+
 # Skip menu and boot installer immediately
 GRUB_TIMEOUT_x86-64 = "0"
 AUTO_SYSLINUXMENU_x86-64 = "0"
 
+GRUB_TIMEOUT_aarch64 = "5"
+
 # grub-efi-native is needed in recipe-sysroot-native to generate the initial
 # configuration file for grub
 DEPENDS_append += " grub-efi-native"
diff --git a/images/enea-nfv-access-vnf.bb b/images/enea-nfv-access-vnf.bb
index a3902c2..ebbb08d 100644
--- a/images/enea-nfv-access-vnf.bb
+++ b/images/enea-nfv-access-vnf.bb
@@ -4,6 +4,7 @@ require images/enea-nfv-access-common.inc
 
 IMAGE_FSTYPES += "wic.qcow2"
 WKS_FILE = "enea-nfv-access-vnf-qemux86-64.wks"
+WKS_FILE_aarch64 = "enea-nfv-access-vnf-qemuarm64.wks"
 
 CLOUDINITPKGS = "cloud-init util-linux-blkid"
 CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}"
diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb
index 9311992..845e668 100644
--- a/images/enea-nfv-access.bb
+++ b/images/enea-nfv-access.bb
@@ -1,7 +1,18 @@
 DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations"
 
+IMAGE_FSTYPES_append_aarch64 = " live"
+IMAGE_TYPES_MASKED_append_aarch64 = " hddimg iso"
+NOISO_aarch64 = "1"
+NOHDD_aarch64 = "0"
+
 require images/enea-nfv-access-host-common.inc
 
 IMAGE_INSTALL += " \
     element-vcpe \
     "
+
+# On AARCH64, the OVMF firmware images are required by KVM, but these images are not
+# pulled explicitly by other recipes.
+IMAGE_INSTALL_append_aarch64 = "\
+    ovmf \
+    "
-- 
cgit v1.2.3-54-g00ecf