meta-arm.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] arm-autonomy: Add missing new override syntax
@ 2021-09-16 17:02 Kamil Dziezyk
  2021-09-16 17:02 ` [PATCH 2/3] arm-bsp/n1sdp: Pin linux-yocto-rt to 5.10 Kamil Dziezyk
  2021-09-16 17:02 ` [PATCH 3/3] arm-autonomy/n1sdp: Fix xen build after tunes files update Kamil Dziezyk
  0 siblings, 2 replies; 3+ messages in thread
From: Kamil Dziezyk @ 2021-09-16 17:02 UTC (permalink / raw)
  To: meta-arm; +Cc: nd

Issue-Id: SCM-2987
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Change-Id: I8d200f1594005f0f9288683d4f1a5f31c2f29b44
---
 meta-arm-autonomy/classes/image_types_xenguest.bbclass      | 6 +++---
 .../recipes-bsp/images/firmware-image-juno.bbappend         | 2 +-
 meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-arm-autonomy/classes/image_types_xenguest.bbclass b/meta-arm-autonomy/classes/image_types_xenguest.bbclass
index 2b9505f..152658f 100644
--- a/meta-arm-autonomy/classes/image_types_xenguest.bbclass
+++ b/meta-arm-autonomy/classes/image_types_xenguest.bbclass
@@ -22,7 +22,7 @@ xenguest_image_add_kernel() {
 # Add rootfs file to the image
 xenguest_image_add_rootfs() {
     call_xenguest_mkimage partial \
-        --disk-add-file=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_TYPEDEP_xenguest}:rootfs.${IMAGE_TYPEDEP_xenguest}
+        --disk-add-file=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_TYPEDEP:xenguest}:rootfs.${IMAGE_TYPEDEP:xenguest}
 }
 
 # Pack xenguest image
@@ -57,7 +57,7 @@ do_bootimg_xenguest[depends] += "xenguest-base-image:do_deploy"
 do_bootimg_xenguest[depends] += "${PN}:do_rootfs"
 
 # This set in python anonymous after, just set a default value here
-IMAGE_TYPEDEP_xenguest ?= "tar"
+IMAGE_TYPEDEP:xenguest ?= "tar"
 
 # We must not be built at rootfs build time because we need the kernel
 IMAGE_TYPES_MASKED += "xenguest"
@@ -158,7 +158,7 @@ python __anonymous() {
             # do_bootimg_xenguest will need the tar file
             d.appendVarFlag('do_bootimg_xenguest', 'depends', ' %s:do_image_tar' % (d.getVar('PN')))
             # set our TYPEDEP to the proper compression
-            d.setVar('IMAGE_TYPEDEP_xenguest', 'tar' + (rootfs_file.split('.tar', 1)[1] or ''))
+            d.setVar('IMAGE_TYPEDEP:xenguest', 'tar' + (rootfs_file.split('.tar', 1)[1] or ''))
 
         if kernel_needed:
             # Tell do_bootimg_xenguest to call xenguest_image_add_kernel
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
index f582b47..324c0c5 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
@@ -18,7 +18,7 @@ do_install:append:autonomy-host() {
 }
 
 DEPLOY_EXTRA_DEPS ??= ""
-DEPLOY_EXTRA_DEPS_autonomy-host = "xen:do_deploy xen-devicetree:do_deploy"
+DEPLOY_EXTRA_DEPS:autonomy-host = "xen:do_deploy xen-devicetree:do_deploy"
 
 do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"
 
diff --git a/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend
index 36e0236..0cece2b 100644
--- a/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend
+++ b/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend
@@ -5,6 +5,6 @@ OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 # Make Xen machine specific
 # This ensures that sstate is properly handled and that each machine can have
 # its own configuration
-PACKAGE_ARCH_autonomy-host = "${MACHINE_ARCH}"
+PACKAGE_ARCH:autonomy-host = "${MACHINE_ARCH}"
 
 PACKAGECONFIG:remove:autonomy-host = "sdl"
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/3] arm-bsp/n1sdp: Pin linux-yocto-rt to 5.10
  2021-09-16 17:02 [PATCH 1/3] arm-autonomy: Add missing new override syntax Kamil Dziezyk
@ 2021-09-16 17:02 ` Kamil Dziezyk
  2021-09-16 17:02 ` [PATCH 3/3] arm-autonomy/n1sdp: Fix xen build after tunes files update Kamil Dziezyk
  1 sibling, 0 replies; 3+ messages in thread
From: Kamil Dziezyk @ 2021-09-16 17:02 UTC (permalink / raw)
  To: meta-arm; +Cc: nd

This pins the rt kernel to the same version as the standard kernel.
Poky has recently upgraded to 5.13, which has not yet been validated
on the n1sdp.

Issue-Id: SCM-2987
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Change-Id: Ie53c27e46f529f5e5dc5a6a6b32d2c021ca22651
---
 meta-arm-bsp/conf/machine/n1sdp.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf
index b0d97f8..7e265ba 100644
--- a/meta-arm-bsp/conf/machine/n1sdp.conf
+++ b/meta-arm-bsp/conf/machine/n1sdp.conf
@@ -20,6 +20,7 @@ WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 # Use kernel provided by yocto
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.10%"
+PREFERRED_VERSION_linux-yocto-rt ?= "5.10%"
 
 # RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 3/3] arm-autonomy/n1sdp: Fix xen build after tunes files update
  2021-09-16 17:02 [PATCH 1/3] arm-autonomy: Add missing new override syntax Kamil Dziezyk
  2021-09-16 17:02 ` [PATCH 2/3] arm-bsp/n1sdp: Pin linux-yocto-rt to 5.10 Kamil Dziezyk
@ 2021-09-16 17:02 ` Kamil Dziezyk
  1 sibling, 0 replies; 3+ messages in thread
From: Kamil Dziezyk @ 2021-09-16 17:02 UTC (permalink / raw)
  To: meta-arm; +Cc: nd

After update f9cd6797d2925496280fd51cf512cab13da63dbf xen build ends with:
| cc1: error: switch '-mcpu=generic' conflicts with '-march=armv8.2-a+crypto' switch [-Werror]
| cc1: all warnings being treated as errors

This patch removes '-march=*' build flag for xen build.

Issue-Id: SCM-2987
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Change-Id: I526c412a0174cdf715b87fcac077b314bf368b8a
---
 .../meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
index 394d1b8..c2916b8 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
@@ -88,3 +88,7 @@ d.getVar('PREFERRED_PROVIDER_alternate/kernel') else ''}"
 # Additionnal kernel modules are necessary for n1sdp to be able to mount FAT
 # filesystems using CP437.
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
+
+# '-mcpu=' and '-march=' conflicts for xen build
+# lets not set '-march=' and let xen to overwrite '-mcpu='
+TUNE_CCARGS:remove:pn-xen = "${TUNE_CCARGS_MARCH}${TUNE_CCARGS_MARCH_OPTS}"
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-16 17:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 17:02 [PATCH 1/3] arm-autonomy: Add missing new override syntax Kamil Dziezyk
2021-09-16 17:02 ` [PATCH 2/3] arm-bsp/n1sdp: Pin linux-yocto-rt to 5.10 Kamil Dziezyk
2021-09-16 17:02 ` [PATCH 3/3] arm-autonomy/n1sdp: Fix xen build after tunes files update Kamil Dziezyk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).