From 718422057615878c92a5075cdc9ca6dda188d5e2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 3 Oct 2017 18:12:08 -0400 Subject: [PATCH] meta-intel: Include and deploy a startup.nsh file On EFI systems we need to include a startup.nsh file that EFI will load and run, in the case of not having the device we're booting from be defined in the boot order. We have the kernel provide this as it is independent of boot loader. Bug-AGL: SPEC-898 Change-Id: Ifdf615e78012e2dbcbd87ee97e4c9d9a19ea01fc Signed-off-by: Tom Rini Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11101 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/meta-intel/recipes-kernel/linux/files/startup.nsh | 1 + .../meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 meta-agl-bsp/meta-intel/recipes-kernel/linux/files/startup.nsh diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/startup.nsh b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/startup.nsh new file mode 100644 index 000000000..33746243d --- /dev/null +++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/startup.nsh @@ -0,0 +1 @@ +fs0:EFI\BOOT\BOOTx64.EFI diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend index d524ebfa4..8b490f709 100644 --- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend +++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.9%.bbappend @@ -10,3 +10,10 @@ KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/extra-graphic-devices.cfg" # Enable support for usb video class for usb camera devices KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" + +# Ensure we have a startup.nsh file +SRC_URI_append = " file://startup.nsh" + +do_deploy_append() { + install -m 0755 ${WORKDIR}/startup.nsh ${DEPLOYDIR}/ +} -- 2.16.6