From d692df24cd1beaa366cd9142deabd67bc023f12a Mon Sep 17 00:00:00 2001 From: Nathan Dunne Date: Thu, 28 Jan 2021 10:06:40 +0000 Subject: [PATCH] arm-autonomy/xen-devictree: Update dom0_mem default inline with best practices Updated default value for XEN_DEVICETREE_DOM0_MEM from "1024M" to "1024M,max:1024" to match best practice for dom0_mem command line argument. Documentation also updated to refer to new default value Issue-Id: SCM-2037 Signed-off-by: Nathan Dunne Change-Id: Ifa7e78bf22b024cb7fe4b782f628860ff44860ad Signed-off-by: Jon Mason --- meta-arm-autonomy/documentation/xen-devicetree.md | 7 ++++--- .../recipes-extended/xen-devicetree/xen-devicetree.bb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-arm-autonomy/documentation/xen-devicetree.md b/meta-arm-autonomy/documentation/xen-devicetree.md index 0d4466a0..0b3f41bf 100644 --- a/meta-arm-autonomy/documentation/xen-devicetree.md +++ b/meta-arm-autonomy/documentation/xen-devicetree.md @@ -70,9 +70,10 @@ The following parameters are available: This variable is only used if XEN_DEVICETREE_XEN_BOOTARGS has a value containing "dom0_mem=${XEN_DEVICETREE_DOM0_MEM}" as the memory assigned to dom0 is defined using Xen boot arguments. - This variable is set by default to "1024M", and cannot be empty. - The value can also be of the form "1024M,max:1024M", as documented here: - https://wiki.xenproject.org/wiki/Do%EF%BB%BFm0_Memory_%E2%80%94_Where_It_Has_Not_Gone + This variable is set by default to "1024M,max:1024", and cannot be empty. + The value can simply specify a size, e.g. "1024M", but best practice is to + also provide a max, documented here: + https://wiki.xenproject.org/wiki/Xen_Project_Best_Practices - XEN_DEVICETREE_DOM0_BOOTARGS: Boot arguments to pass to Dom0 Linux when booting it. diff --git a/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb b/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb index c6a785f2..29b80231 100644 --- a/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb +++ b/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb @@ -19,7 +19,7 @@ DESCRIPTION = "Add entries in DTB for Xen and Dom0" XEN_DEVICETREE_DEPEND_append = " virtual/kernel:do_deploy" XEN_DEVICETREE_DTBS ?= "${KERNEL_DEVICETREE}" XEN_DEVICETREE_XEN_BOOTARGS ?= "noreboot dom0_mem=${XEN_DEVICETREE_DOM0_MEM}" -XEN_DEVICETREE_DOM0_MEM ?= "1024M" +XEN_DEVICETREE_DOM0_MEM ?= "1024M,max:1024M" XEN_DEVICETREE_DOM0_BOOTARGS ?= "console=hvc0 earlycon=xen" XEN_DEVICETREE_DOM0_ADDR ?= "0x80080000" XEN_DEVICETREE_DOM0_SIZE ?= "0x01000000"