From abba76354a049c48fcdf4a252383ccd5c119b8ae Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Mon, 9 Jul 2018 19:16:26 +0200 Subject: [PATCH] test/py: return a RAM address different from 0 as it can be interpreted as NULL Some functions test that the given address is not NULL (0) and fail or have a different behaviour if that's the case (e.g. hexport_r). Let's make the RAM base address to be not zero by setting it to 2MiB if that's the case. 2MiB is chosen because it represents the size of an ARM LPAE/v8 section. Suggested-by: Stephen Warren Signed-off-by: Quentin Schulz Reviewed-by: Simon Glass Reviewed-by: Stephen Warren Tested-by: Stephen Warren --- test/py/u_boot_utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/py/u_boot_utils.py b/test/py/u_boot_utils.py index d68d1dd105..bf2a0fc0e2 100644 --- a/test/py/u_boot_utils.py +++ b/test/py/u_boot_utils.py @@ -236,6 +236,12 @@ def find_ram_base(u_boot_console): ram_base = -1 raise Exception('Failed to find RAM bank start in `bdinfo`') + # We don't want ram_base to be zero as some functions test if the given + # address is NULL (0). Let's add 2MiB then (size of an ARM LPAE/v8 section). + + if ram_base == 0: + ram_base += 1024 * 1024 * 2 + return ram_base class PersistentFileHelperCtxMgr(object): -- 2.39.5