From 6a92503d9b99817c430dc0c86ce540010bbb5fd3 Mon Sep 17 00:00:00 2001 From: Nathan Dunne Date: Tue, 13 Oct 2020 09:45:46 +0000 Subject: [PATCH] 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. Change-Id: I3ba77453be785ec92ab45255cbd34d7d77bbcf37 Issue-Id: SCM-1524 Signed-off-by: Nathan Dunne Reviewed-by: Diego Sueiro Signed-off-by: Jon Mason --- .../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 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 index fc24ee8a..5f3d8f81 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 @@ -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 a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc new file mode 100644 index 00000000..eb16bc89 --- /dev/null +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc @@ -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 a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc new file mode 100644 index 00000000..02600c59 --- /dev/null +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc @@ -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 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 41c9433d..472dd2a1 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 @@ -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" 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 deleted file mode 100644 index d9c88fbd..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-manager.bbappend +++ /dev/null @@ -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 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 deleted file mode 100644 index 1698d237..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xenguest/xenguest-network.bbappend +++ /dev/null @@ -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"