diff --git a/tools/hardware/utils/memory.py b/tools/hardware/utils/memory.py index 6fcb227bb..56134cb7d 100644 --- a/tools/hardware/utils/memory.py +++ b/tools/hardware/utils/memory.py @@ -90,16 +90,13 @@ def align_memory(regions: Set[Region], config: Config) -> List[Region]: aligned out and the physBase value that the kernel will use. ''' ret = sorted(regions) - extra_reserved = set() if config.get_kernel_phys_align() != 0: new = ret[0].align_base(config.get_kernel_phys_align()) - resv = Region(ret[0].base, new.base - ret[0].base) - extra_reserved.add(resv) ret[0] = new physBase = ret[0].base - return ret, extra_reserved, physBase + return ret, physBase def get_physical_memory(tree: FdtParser, config: Config) -> List[Region]: @@ -107,9 +104,9 @@ def get_physical_memory(tree: FdtParser, config: Config) -> List[Region]: regions = merge_memory_regions(get_memory_regions(tree)) reserved = parse_reserved_regions(tree.get_path('/reserved-memory')) regions = reserve_regions(regions, reserved) - regions, extra_reserved, physBase = align_memory(regions, config) + regions, physBase = align_memory(regions, config) - return regions, reserved.union(extra_reserved), physBase + return regions, reserved, physBase def get_addrspace_exclude(regions: List[Region], config: Config):