Skip to contentSkip to conversation

arm-autonomy: Drop foundation-armv8 support

PATCH In review Nathan Dunne 3 participants 5 messages Oct 13, 2020 – Oct 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm-autonomy: Drop foundation-armv8 support

Remove foundation-armv8 overrides from arm-autonomy recipes.

Change-Id: I7913ccdb3383bdf40b608fc852428716e1538318
Issue-Id: SCM-1525

---
 .../xen-devicetree/xen-devicetree.bbappend                 | 4 ----
 .../xen/files/{fvp => fvp-base}/early-printk.cfg           | 0
 .../meta-arm-bsp/recipes-extended/xen/xen_%.bbappend       | 7 +------
 .../recipes-extended/xenguest/xenguest-manager.bbappend    | 3 +--
 .../recipes-extended/xenguest/xenguest-network.bbappend    | 2 --
 .../meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend     | 1 -
 6 files changed, 2 insertions(+), 15 deletions(-)
 rename meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/{fvp => fvp-base}/early-printk.cfg (100%)
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend +0 -4
index 8284c63..2c875a9 100644
@@ -21,7 +21,3 @@ XEN_DEVICETREE_XEN_BOOTARGS_append_n1sdp = " console=dtuart dtuart=serial0 boots
 
 XEN_DEVICETREE_DOM0_BOOTARGS_append_fvp-base = " root=/dev/vda2"
 XEN_DEVICETREE_XEN_BOOTARGS_append_fvp-base = " console=dtuart dtuart=serial0 bootscrub=0"
-
-XEN_DEVICETREE_DOM0_BOOTARGS_append_foundation-armv8 = " root=/dev/vda2"
-XEN_DEVICETREE_XEN_BOOTARGS_append_foundation-armv8 = " console=dtuart dtuart=serial0 bootscrub=0"
-
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp-base/early-printk.cfg renamed from meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp/early-printk.cfg +0 -0
similarity index 100%
rename from meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp/early-printk.cfg
rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp-base/early-printk.cfg
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend +1 -6
index 89130a6..ef3cc23 100644
@@ -1,11 +1,6 @@
-# Foundation-armv8 support
-COMPATIBLE_MACHINE_foundation-armv8 = "foundation-armv8"
-FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp:"
-SRC_URI_append_foundation-armv8 = " file://early-printk.cfg"
-
 # FVP Base support
 COMPATIBLE_MACHINE_fvp-base = "fvp-base"
-FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp:"
+FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files:"
 SRC_URI_append_fvp-base = " file://early-printk.cfg"
 
 # Juno support
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend +1 -2
index 874cfed..d9c88fb 100644
@@ -1,6 +1,5 @@
 # Board specific configuration for the manager
 
-# FVP and Foundation are using vda as hard drive and partition 2 is the
+# FVP uses vda as hard drive and partition 2 is the
 # default rootfs, so use vda3 for guest lvm
-XENGUEST_MANAGER_VOLUME_DEVICE_foundation-armv8 ?= "/dev/vda3"
 XENGUEST_MANAGER_VOLUME_DEVICE_fvp-base ?= "/dev/vda3"
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend +0 -2
index 1efd7c6..1698d23 100644
@@ -2,7 +2,5 @@ XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
 
 XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
 
-XENGUEST_NETWORK_BRIDGE_MEMBERS_foundation-armv8 ?= "eth0"
-
 # Juno board has 2 network interfaces, add both of them to the bridge
 XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend +0 -1
index 5231f51..c8eaad7 100644
@@ -13,4 +13,3 @@ LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE = "${@bb.utils.contains_any('DISTRO_FEATURE
                                          ' features/arm-autonomy/disable-arm64-sve.scc','',d)}"
 
 KERNEL_FEATURES_append_fvp-base = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"
-KERNEL_FEATURES_append_foundation-armv8 = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 arm-autonomy: Move machine override soft assignments to inc files

Moved assignments of the form:

     MYVAR_$MACHINE ?= "val"

to a machine specific .inc file, as the above will still set the value when the base variable has been set in local.conf, e.g:
MYVAR = "local_val"
despite the weak assignment.

Issue-Id: SCM-1524

Change-Id I3ba77453be785ec92ab45255cbd34d7d77bbcf37
---
 .../conf/machine/arm-autonomy-machine-extra-settings.inc   | 2 ++
 .../meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc  | 7 +++++++
 .../meta-arm-bsp/conf/machine/juno-extra-settings.inc      | 4 ++++
 .../meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc     | 4 ++++
 .../recipes-extended/xenguest/xenguest-manager.bbappend    | 5 -----
 .../recipes-extended/xenguest/xenguest-network.bbappend    | 6 ------
 6 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc
 create mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc
 delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend
 delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/arm-autonomy-machine-extra-settings.inc +2 -0
index fc24ee8..5f3d8f8 100644
@@ -1,5 +1,7 @@
 # Require extra machine specific settings
 ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE ?= ""
 ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_n1sdp = "n1sdp-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_fvp-base = "fvp-base-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_juno = "juno-extra-settings.inc"
 
 require ${ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE}
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc new file +7 -0
new file mode 100644
index 0000000..eb16bc8
@@ -0,0 +1,7 @@
+# Extra machine settings for fvp-base
+
+# FVP uses vda as hard drive and partition 2 is the
+# default rootfs, so use vda3 for guest lvm
+XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/vda3"
+
+XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc new file +4 -0
new file mode 100644
index 0000000..02600c5
@@ -0,0 +1,4 @@
+# Extra machine settings for juno
+
+# Juno board has 2 network interfaces, add both of them to the bridge
+XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0 eth1"
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc +4 -0
index 41c9433..472dd2a 100644
@@ -1,3 +1,5 @@
+# Extra machine settings for n1sdp
+
 # We need to extent the wks search path to be able to find the wks file set in
 # ARM_AUTONOMY_WKS_FILE.
 WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
@@ -19,6 +21,8 @@ GRUB_CFG_FILE ?= "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic/arm-autonomy-n1sdp-gru
 # the "/" partition is /dev/sda2.
 XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/sda3"
 
+XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
+
 # The XEN_DEVICETREE_DEPEND and XEN_DEVICETREE_DTBS variables aftect the
 # xen-devicetree.bb recipe
 XEN_DEVICETREE_DEPEND = "virtual/trusted-firmware-a:do_deploy"
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend deleted +0 -5
deleted file mode 100644
index d9c88fb..0000000
@@ -1,5 +0,0 @@
-# Board specific configuration for the manager
-
-# FVP uses vda as hard drive and partition 2 is the
-# default rootfs, so use vda3 for guest lvm
-XENGUEST_MANAGER_VOLUME_DEVICE_fvp-base ?= "/dev/vda3"
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend deleted +0 -6
deleted file mode 100644
index 1698d23..0000000
@@ -1,6 +0,0 @@
-XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
-
-XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
-
-# Juno board has 2 network interfaces, add both of them to the bridge
-XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"
Signature · 1 line
2.17.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] arm-autonomy: Move machine override soft assignments to inc files

Quoted 8 lines · Nathan Dunne

Moved assignments of the form:

     MYVAR_$MACHINE ?= "val"

to a machine specific .inc file, as the above will still set the value when the base variable has been set in local.conf, e.g:
MYVAR = "local_val"
despite the weak assignment.

Quoted 4 lines

Issue-Id: SCM-1524

Change-Id I3ba77453be785ec92ab45255cbd34d7d77bbcf37

---

Quoted 113 lines
 .../conf/machine/arm-autonomy-machine-extra-settings.inc   | 2 ++
 .../meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc  | 7 +++++++
 .../meta-arm-bsp/conf/machine/juno-extra-settings.inc      | 4 ++++
 .../meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc     | 4 ++++
 .../recipes-extended/xenguest/xenguest-manager.bbappend    | 5 -----
 .../recipes-extended/xenguest/xenguest-network.bbappend    | 6 ------
 6 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc
 create mode 100644
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc
 delete mode 100644
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend
 delete mode 100644

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/arm-autonomy-machine-extra-settings.inc index fc24ee8..5f3d8f8 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/arm-autonomy-machine-extra-settings.inc
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/arm-autonomy-machine-extra-settings.inc

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/arm-autonomy-machine-extra-settings.inc +2 -0
@@ -1,5 +1,7 @@
 # Require extra machine specific settings
 ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE ?= ""
 ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_n1sdp = "n1sdp-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_fvp-base = "fvp-base-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_juno = "juno-extra-settings.inc"
 
 require ${ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE}

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc new file mode 100644
index 0000000..eb16bc8
--- /dev/null
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc new file +7 -0
@@ -0,0 +1,7 @@
+# Extra machine settings for fvp-base
+
+# FVP uses vda as hard drive and partition 2 is the
+# default rootfs, so use vda3 for guest lvm
+XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/vda3"
+
+XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc new file mode 100644
index 0000000..02600c5
--- /dev/null
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc new file +4 -0
@@ -0,0 +1,4 @@
+# Extra machine settings for juno
+
+# Juno board has 2 network interfaces, add both of them to the bridge
+XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0 eth1"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc index 41c9433..472dd2a 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

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc +2 -0
@@ -1,3 +1,5 @@
+# Extra machine settings for n1sdp
+
 # We need to extent the wks search path to be able to find the wks file set

in
# ARM_AUTONOMY_WKS_FILE.
WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"

(quoted diff) +0 -0
@@ -19,6 +21,8 @@ GRUB_CFG_FILE ?=

"${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic/arm-autonomy-n1sdp-gru

 # the "/" partition is /dev/sda2.
 XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/sda3"
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc +2 -0
+XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
+
 # The XEN_DEVICETREE_DEPEND and XEN_DEVICETREE_DTBS variables aftect the
 # xen-devicetree.bb recipe
 XEN_DEVICETREE_DEPEND = "virtual/trusted-firmware-a:do_deploy"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend deleted file mode 100644
index d9c88fb..0000000
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend +++ /dev/null

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend deleted +0 -5
@@ -1,5 +0,0 @@
-# Board specific configuration for the manager
-
-# FVP uses vda as hard drive and partition 2 is the
-# default rootfs, so use vda3 for guest lvm
-XENGUEST_MANAGER_VOLUME_DEVICE_fvp-base ?= "/dev/vda3"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend deleted file mode 100644
index 1698d23..0000000
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend +++ /dev/null

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend deleted +0 -6
@@ -1,6 +0,0 @@
-XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
-
-XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
-
-# Juno board has 2 network interfaces, add both of them to the bridge
-XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"
Signature · 1 line
2.17.1
Reviewed-by on v1 1/2
#3 lore raw
In reply to Nathan Dunne
Quoted 14 lines · Nathan Dunne

Remove foundation-armv8 overrides from arm-autonomy recipes.

Change-Id: I7913ccdb3383bdf40b608fc852428716e1538318
Issue-Id: SCM-1525

---
 .../xen-devicetree/xen-devicetree.bbappend                 | 4 ----
 .../xen/files/{fvp => fvp-base}/early-printk.cfg           | 0
 .../meta-arm-bsp/recipes-extended/xen/xen_%.bbappend       | 7 +------
 .../recipes-extended/xenguest/xenguest-manager.bbappend    | 3 +--
 .../recipes-extended/xenguest/xenguest-network.bbappend    | 2 --
 .../meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend     | 1 -
 6 files changed, 2 insertions(+), 15 deletions(-)
Quoted 8 lines

rename
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/{fvp => fvp-base}/early-printk.cfg (100%)

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend index 8284c63..2c875a9 100644
---

Quoted 91 lines

a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend

(quoted diff) +0 -0
@@ -21,7 +21,3 @@ XEN_DEVICETREE_XEN_BOOTARGS_append_n1sdp = " console=dtuart

dtuart=serial0 boots

XEN_DEVICETREE_DOM0_BOOTARGS_append_fvp-base = " root=/dev/vda2" XEN_DEVICETREE_XEN_BOOTARGS_append_fvp-base = " console=dtuart dtuart=serial0
bootscrub=0"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend +0 -3
-
-XEN_DEVICETREE_DOM0_BOOTARGS_append_foundation-armv8 = " root=/dev/vda2"
-XEN_DEVICETREE_XEN_BOOTARGS_append_foundation-armv8 = " console=dtuart

dtuart=serial0 bootscrub=0"
-
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp/early-printk.cfg b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp-base/early-printk.cfg similarity index 100%
rename from meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp/early-printk.cfg rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp-base/early-printk.cfg diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend index 89130a6..ef3cc23 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend +1 -6
@@ -1,11 +1,6 @@
-# Foundation-armv8 support
-COMPATIBLE_MACHINE_foundation-armv8 = "foundation-armv8"
-FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp:"
-SRC_URI_append_foundation-armv8 = " file://early-printk.cfg"
-
 # FVP Base support
 COMPATIBLE_MACHINE_fvp-base = "fvp-base"
-FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp:"
+FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files:"
 SRC_URI_append_fvp-base = " file://early-printk.cfg"
 
 # Juno support

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend index 874cfed..d9c88fb 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend +1 -2
@@ -1,6 +1,5 @@
 # Board specific configuration for the manager
 
-# FVP and Foundation are using vda as hard drive and partition 2 is the
+# FVP uses vda as hard drive and partition 2 is the
 # default rootfs, so use vda3 for guest lvm
-XENGUEST_MANAGER_VOLUME_DEVICE_foundation-armv8 ?= "/dev/vda3"
 XENGUEST_MANAGER_VOLUME_DEVICE_fvp-base ?= "/dev/vda3"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend index 1efd7c6..1698d23 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend +0 -2
@@ -2,7 +2,5 @@ XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
 
 XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
 
-XENGUEST_NETWORK_BRIDGE_MEMBERS_foundation-armv8 ?= "eth0"
-
 # Juno board has 2 network interfaces, add both of them to the bridge
 XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend index 5231f51..c8eaad7 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend

(quoted diff) +0 -0
@@ -13,4 +13,3 @@ LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE =

"${@bb.utils.contains_any('DISTRO_FEATURE

                                          '

features/arm-autonomy/disable-arm64-sve.scc','',d)}"

KERNEL_FEATURES_append_fvp-base = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"
-KERNEL_FEATURES_append_foundation-armv8 = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"

Signature · 1 line
2.17.1
#4 lore raw
Quoted 20 lines · Diego Sueiro
Quoted 18 lines · Nathan Dunne

Remove foundation-armv8 overrides from arm-autonomy recipes.

Change-Id: I7913ccdb3383bdf40b608fc852428716e1538318
Issue-Id: SCM-1525

---
 .../xen-devicetree/xen-devicetree.bbappend                 | 4 ----
 .../xen/files/{fvp => fvp-base}/early-printk.cfg           | 0
 .../meta-arm-bsp/recipes-extended/xen/xen_%.bbappend       | 7 +------
 .../recipes-extended/xenguest/xenguest-manager.bbappend    | 3 +--
 .../recipes-extended/xenguest/xenguest-network.bbappend    | 2 --
 .../meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend     | 1 -
 6 files changed, 2 insertions(+), 15 deletions(-)

rename
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/{fvp => fvp-base}/early-printk.cfg (100%)

Quoted 6 lines
Quoted 4 lines

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend index 8284c63..2c875a9 100644
---

Both patches pulled into master.

Thanks,
Jon

Quoted 95 lines
Quoted 91 lines

a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend

(quoted diff) +0 -0
@@ -21,7 +21,3 @@ XEN_DEVICETREE_XEN_BOOTARGS_append_n1sdp = " console=dtuart

dtuart=serial0 boots

XEN_DEVICETREE_DOM0_BOOTARGS_append_fvp-base = " root=/dev/vda2" XEN_DEVICETREE_XEN_BOOTARGS_append_fvp-base = " console=dtuart dtuart=serial0
bootscrub=0"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend +0 -3
-
-XEN_DEVICETREE_DOM0_BOOTARGS_append_foundation-armv8 = " root=/dev/vda2"
-XEN_DEVICETREE_XEN_BOOTARGS_append_foundation-armv8 = " console=dtuart

dtuart=serial0 bootscrub=0"
-
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp/early-printk.cfg b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp-base/early-printk.cfg similarity index 100%
rename from meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp/early-printk.cfg rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/files/fvp-base/early-printk.cfg diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend index 89130a6..ef3cc23 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend +1 -6
@@ -1,11 +1,6 @@
-# Foundation-armv8 support
-COMPATIBLE_MACHINE_foundation-armv8 = "foundation-armv8"
-FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp:"
-SRC_URI_append_foundation-armv8 = " file://early-printk.cfg"
-
 # FVP Base support
 COMPATIBLE_MACHINE_fvp-base = "fvp-base"
-FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp:"
+FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files:"
 SRC_URI_append_fvp-base = " file://early-printk.cfg"
 
 # Juno support

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend index 874cfed..d9c88fb 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend +1 -2
@@ -1,6 +1,5 @@
 # Board specific configuration for the manager
 
-# FVP and Foundation are using vda as hard drive and partition 2 is the
+# FVP uses vda as hard drive and partition 2 is the
 # default rootfs, so use vda3 for guest lvm
-XENGUEST_MANAGER_VOLUME_DEVICE_foundation-armv8 ?= "/dev/vda3"
 XENGUEST_MANAGER_VOLUME_DEVICE_fvp-base ?= "/dev/vda3"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend index 1efd7c6..1698d23 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend +0 -2
@@ -2,7 +2,5 @@ XENGUEST_NETWORK_BRIDGE_MEMBERS_n1sdp ?= "eth0"
 
 XENGUEST_NETWORK_BRIDGE_MEMBERS_fvp-base ?= "eth0"
 
-XENGUEST_NETWORK_BRIDGE_MEMBERS_foundation-armv8 ?= "eth0"
-
 # Juno board has 2 network interfaces, add both of them to the bridge
 XENGUEST_NETWORK_BRIDGE_MEMBERS_juno ?= "eth0 eth1"

diff --git b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend index 5231f51..c8eaad7 100644
---
a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
+++
b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend

(quoted diff) +0 -0
@@ -13,4 +13,3 @@ LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE =

"${@bb.utils.contains_any('DISTRO_FEATURE

                                          '

features/arm-autonomy/disable-arm64-sve.scc','',d)}"

KERNEL_FEATURES_append_fvp-base = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"
-KERNEL_FEATURES_append_foundation-armv8 = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"

Signature · 1 line
2.17.1