Skip to contentSkip to conversation

arm-bsp/wic: fix WKS dependencies for N1SDP components

PATCH Superseded Khasim Mohammed 2 participants 3 messages Jul 23, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm-bsp/wic: fix WKS dependencies for N1SDP components

Add build-time dependencies to ensure the required components (TFA, SCP, UEFI EDK2) are built and available before the task to create wic image gets initiated.

Change-Id: I3789c8d1a44984a26d31ddd8ddd5d16f4d58c7d3
Issue-Id: PLATFORMS-3134

---
 meta-arm-bsp/conf/machine/n1sdp.conf | 1 +
 1 file changed, 1 insertion(+)
meta-arm-bsp/conf/machine/n1sdp.conf +1 -0
index 139f619..7925969 100644
@@ -17,6 +17,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 
 # Set default WKS
 WKS_FILE ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
+WKS_FILE_DEPENDS_append = "${EXTRA_IMAGEDEPENDS}"
 
 # Use kernel provided by linaro (Contains support for SCMi or HDMI)
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 17 lines · Khasim Mohammed

Add build-time dependencies to ensure the required components (TFA, SCP, UEFI EDK2) are built and available before the task to create wic image gets initiated.

Change-Id: I3789c8d1a44984a26d31ddd8ddd5d16f4d58c7d3
Issue-Id: PLATFORMS-3134

---
 meta-arm-bsp/conf/machine/n1sdp.conf | 1 +
 1 file changed, 1 insertion(+)
meta-arm-bsp/conf/machine/n1sdp.conf +0 -0
index 139f619..7925969 100644

meta-arm-bsp/conf/machine/n1sdp.conf SERIAL_CONSOLES = "115200;ttyAMA0" · line 20

Quoted 4 lines
meta-arm-bsp/conf/machine/n1sdp.conf +1 -0
@@ -17,6 +17,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 
 # Set default WKS
 WKS_FILE ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
+WKS_FILE_DEPENDS_append = "${EXTRA_IMAGEDEPENDS}"

with _append you need an extra leading space.

Quoted 7 lines
meta-arm-bsp/conf/machine/n1sdp.conf +0 -1
 # Use kernel provided by linaro (Contains support for SCMi or HDMI)
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
--

2.17.1

#2 lore raw

________________________________________
From: Nicolas Dechesne <[email protected]>
Sent: Thursday, July 23, 2020 5:06 PM
To: Khasim Mohammed
Cc: [email protected]; nd
Subject: Re: [meta-arm] [PATCH] arm-bsp/wic: fix WKS dependencies for N1SDP components

Quoted 22 lines · Khasim Mohammed

Add build-time dependencies to ensure the required components (TFA, SCP, UEFI EDK2) are built and available before the task to create wic image gets initiated.

Change-Id: I3789c8d1a44984a26d31ddd8ddd5d16f4d58c7d3
Issue-Id: PLATFORMS-3134

---
 meta-arm-bsp/conf/machine/n1sdp.conf | 1 +
 1 file changed, 1 insertion(+)
meta-arm-bsp/conf/machine/n1sdp.conf +1 -0
index 139f619..7925969 100644
@@ -17,6 +17,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 
 # Set default WKS
 WKS_FILE ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
+WKS_FILE_DEPENDS_append = "${EXTRA_IMAGEDEPENDS}"
 
Quoted 1 line

with _append you need an extra leading space.

Corrected - thanks Nico.

Quoted 7 lines

# Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm"
--
2.17.1