[meta-arm,1/2] arm-autonomy: Drop foundation-armv8 support

Submitted by Nathan Dunne on Oct. 13, 2020, 9:45 a.m. | Patch ID: 177178

Details

Message ID 20201013094546.11726-1-Nathan.Dunne@arm.com
State New
Headers show

Commit Message

Nathan Dunne Oct. 13, 2020, 9:45 a.m.
Remove foundation-armv8 overrides from arm-autonomy recipes.

Change-Id: I7913ccdb3383bdf40b608fc852428716e1538318
Issue-Id: SCM-1525
Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
---
 .../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%)

Patch hide | download patch | download mbox

diff --git 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
index 8284c63..2c875a9 100644
--- 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
@@ -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"
-
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 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
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
@@ -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 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
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
@@ -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 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
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
@@ -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 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
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
@@ -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}"

Comments

Diego Sueiro Oct. 13, 2020, 9:48 a.m.
On Tue, Oct 13, 2020 at 10:46 AM, Nathan Dunne wrote:

>
> Remove foundation-armv8 overrides from arm-autonomy recipes.
> 
> Change-Id: I7913ccdb3383bdf40b608fc852428716e1538318
> Issue-Id: SCM-1525
> Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
> ---
>  .../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%)
> 
> diff --git
> b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend
> index 8284c63..2c875a9 100644
> ---

Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>

> 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
> @@ -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"
> -
> 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
> @@ -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
> @@ -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
> @@ -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
> @@ -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}"
> -- 
> 2.17.1
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1188): https://lists.yoctoproject.org/g/meta-arm/message/1188
Mute This Topic: https://lists.yoctoproject.org/mt/77479810/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason Oct. 14, 2020, 10:54 a.m.
On Tue, Oct 13, 2020 at 02:48:26AM -0700, Diego Sueiro wrote:
> On Tue, Oct 13, 2020 at 10:46 AM, Nathan Dunne wrote:
> 
> >
> > Remove foundation-armv8 overrides from arm-autonomy recipes.
> > 
> > Change-Id: I7913ccdb3383bdf40b608fc852428716e1538318
> > Issue-Id: SCM-1525
> > Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
> > ---
> >  .../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%)
> > 
> > diff --git
> > b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend
> > index 8284c63..2c875a9 100644
> > ---
> 
> Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>

Both patches pulled into master.

Thanks,
Jon
 
> > 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
> > @@ -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"
> > -
> > 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
> > @@ -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
> > @@ -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
> > @@ -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
> > @@ -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}"
> > -- 
> > 2.17.1
> > 
> >

> 
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1193): https://lists.yoctoproject.org/g/meta-arm/message/1193
Mute This Topic: https://lists.yoctoproject.org/mt/77479810/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-