Instead of duplicating this logic, put it in a little helper module. Change-Id: I2ca881c8de7e6ec6d4a940255d9ba97226e78d87 Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>