From 82b31654b0e1fdb397b64932b3863d895f5e37ad Mon Sep 17 00:00:00 2001 From: Nathan Dunne Date: Thu, 28 Jan 2021 10:06:38 +0000 Subject: [PATCH] arm-autonomy/xen-devicetree: Allow hex or decimal Dom0 Size Check whether XEN_DEVICETREE_DOM0_SIZE begins '0x' and cast from hex or decimal accordingly, rather than assuming hex. Issue-Id: SCM-2037 Signed-off-by: Nathan Dunne Change-Id: I3a1c7c7ae6711b3d645cdb66bcd9c2c27196b054 Signed-off-by: Jon Mason --- .../recipes-extended/xen-devicetree/xen-devicetree.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 13afb7a2..398385a6 100644 --- a/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb +++ b/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb @@ -88,7 +88,11 @@ python calc_xen_dtb_dom0_size() { bb.note('size in bytes: %d' % size) # Ceil to MiB size_required = ceil(size / (2 ** 20)) * (2 ** 20) - size_defined = int(d.getVar('XEN_DEVICETREE_DOM0_SIZE'), 16) + xen_devicetree_dom0_size = d.getVar('XEN_DEVICETREE_DOM0_SIZE') + if xen_devicetree_dom0_size[:2] == "0x": + size_defined = int(xen_devicetree_dom0_size, 16) + else: + size_defined = int(xen_devicetree_dom0_size) if size_required > size_defined: bb.note ("Wrong kernel size setting inside xen dtb!\n"\