From 85bc0d2fe5db0c51fe6f91bfbc2c8b9883449f7d Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 27 Jun 2019 15:30:55 -0700 Subject: [PATCH] Revert "gen_app_partitions.py: make generated/app_smem_*.ld files deterministic" This reverts commit 725abdf4304d which did get rid of randomness in the order of the partition _names_ as claimed but regressed commit 212ec9a29a / feature #14121 and broke the previous size order which I missed. Huge thanks to Sigvart Hovland for spotting this in a post-merge but prompt code review. Proper fix in the next commit. Signed-off-by: Marc Herbert --- scripts/gen_app_partitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen_app_partitions.py b/scripts/gen_app_partitions.py index 616fb533d51105..3b6ff4751b5206 100644 --- a/scripts/gen_app_partitions.py +++ b/scripts/gen_app_partitions.py @@ -162,7 +162,7 @@ def parse_elf_file(partitions): def generate_final_linker(linker_file, partitions): string = linker_start_seq size_string = '' - for partition, item in sorted(partitions.items()): + for partition, item in partitions.items(): string += data_template.format(partition) if LIB in item: for lib in item[LIB]: