From 0aa489527c789c329c6c417d4d22e98f64263e3e Mon Sep 17 00:00:00 2001 From: mingxguo27 Date: Fri, 18 Sep 2020 12:00:12 +0000 Subject: [PATCH] Changed reproducible --- reproducible/reference_elf2tab_macos-10.15.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/reproducible/reference_elf2tab_macos-10.15.txt b/reproducible/reference_elf2tab_macos-10.15.txt index 044cd28..490e6c1 100644 --- a/reproducible/reference_elf2tab_macos-10.15.txt +++ b/reproducible/reference_elf2tab_macos-10.15.txt @@ -2,7 +2,11 @@ Board: nrf52840dk ---------------------------------------- Creating "target/tab/thumbv7em-none-eabi.tbf" +<<<<<<< HEAD Min RAM size from segments in ELF: 20 bytes +======= +Min RAM size from sections in ELF: 20 bytes +>>>>>>> 716db1b (Changed reproducible) Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section @@ -21,11 +25,19 @@ TBF Header: start_process_ram: 4294967295 0xFFFFFFFF start_process_flash: 262208 0x40040 +<<<<<<< HEAD +======= + +>>>>>>> 716db1b (Changed reproducible) ======================================== Board: nrf52840_dongle ---------------------------------------- Creating "target/tab/thumbv7em-none-eabi.tbf" +<<<<<<< HEAD Min RAM size from segments in ELF: 20 bytes +======= +Min RAM size from sections in ELF: 20 bytes +>>>>>>> 716db1b (Changed reproducible) Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section @@ -44,6 +56,10 @@ TBF Header: start_process_ram: 4294967295 0xFFFFFFFF start_process_flash: 262208 0x40040 +<<<<<<< HEAD +======= + +>>>>>>> 716db1b (Changed reproducible) ======================================== Board: nrf52840_dongle_dfu ----------------------------------------