From 6f1c73085a250d87cc63e2dec2d772a9ab5d8f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Silva?= Date: Tue, 11 Jun 2024 15:13:54 +0100 Subject: [PATCH] Update armmem on embedded targets to elfmem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Silva --- .github/workflows/exp-mmw-int-fw-build.yml | 6 +++--- .github/workflows/exp-template-fw-build.yml | 6 +++--- .github/workflows/pmc-fw-build.yml | 6 +++--- .github/workflows/rv-fw-build.yml | 6 +++--- software/exp/mmw-int/Makefile | 2 +- software/exp/template/Makefile | 2 +- software/pmc/Makefile | 2 +- software/rv/Makefile | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/exp-mmw-int-fw-build.yml b/.github/workflows/exp-mmw-int-fw-build.yml index 18f5cc63..8ef0e5d2 100644 --- a/.github/workflows/exp-mmw-int-fw-build.yml +++ b/.github/workflows/exp-mmw-int-fw-build.yml @@ -29,9 +29,9 @@ jobs: - name: Install build dependencies run: | - # Install armmem - wget https://github.com/vankxr/armmem/releases/download/1.0-1/armmem_1.0-1_amd64.deb - sudo dpkg -i armmem_1.0-1_amd64.deb + # Install elfmem + wget https://github.com/vankxr/elfmem/releases/download/2.0-0/elfmem_2.0-0_amd64.deb + sudo dpkg -i elfmem_2.0-0_amd64.deb # Install Core pack git clone https://github.com/vankxr/Core-CMSIS diff --git a/.github/workflows/exp-template-fw-build.yml b/.github/workflows/exp-template-fw-build.yml index e94b068f..d15401f6 100644 --- a/.github/workflows/exp-template-fw-build.yml +++ b/.github/workflows/exp-template-fw-build.yml @@ -29,9 +29,9 @@ jobs: - name: Install build dependencies run: | - # Install armmem - wget https://github.com/vankxr/armmem/releases/download/1.0-1/armmem_1.0-1_amd64.deb - sudo dpkg -i armmem_1.0-1_amd64.deb + # Install elfmem + wget https://github.com/vankxr/elfmem/releases/download/2.0-0/elfmem_2.0-0_amd64.deb + sudo dpkg -i elfmem_2.0-0_amd64.deb # Install Core pack git clone https://github.com/vankxr/Core-CMSIS diff --git a/.github/workflows/pmc-fw-build.yml b/.github/workflows/pmc-fw-build.yml index bdef1947..25518c87 100644 --- a/.github/workflows/pmc-fw-build.yml +++ b/.github/workflows/pmc-fw-build.yml @@ -29,9 +29,9 @@ jobs: - name: Install build dependencies run: | - # Install armmem - wget https://github.com/vankxr/armmem/releases/download/1.0-1/armmem_1.0-1_amd64.deb - sudo dpkg -i armmem_1.0-1_amd64.deb + # Install elfmem + wget https://github.com/vankxr/elfmem/releases/download/2.0-0/elfmem_2.0-0_amd64.deb + sudo dpkg -i elfmem_2.0-0_amd64.deb # Install Core pack git clone https://github.com/vankxr/Core-CMSIS diff --git a/.github/workflows/rv-fw-build.yml b/.github/workflows/rv-fw-build.yml index c7e81c03..b75bfbe9 100644 --- a/.github/workflows/rv-fw-build.yml +++ b/.github/workflows/rv-fw-build.yml @@ -37,9 +37,9 @@ jobs: - name: Install build dependencies run: | - # Install armmem - wget https://github.com/vankxr/armmem/releases/download/1.0-1/armmem_1.0-1_amd64.deb - sudo dpkg -i armmem_1.0-1_amd64.deb + # Install elfmem + wget https://github.com/vankxr/elfmem/releases/download/2.0-0/elfmem_2.0-0_amd64.deb + sudo dpkg -i elfmem_2.0-0_amd64.deb timeout-minutes: 5 - uses: actions/checkout@v4 diff --git a/software/exp/mmw-int/Makefile b/software/exp/mmw-int/Makefile index f3972344..19d7bcc7 100644 --- a/software/exp/mmw-int/Makefile +++ b/software/exp/mmw-int/Makefile @@ -148,7 +148,7 @@ version: mem-usage: $(TARGET).elf @echo --------------------------------------------------------------------------- - @armmem -l $(LDSCRIPT) -d -h $< + @armmem -l $(LDSCRIPT) -d -h -z -e ".ARM,.ARM.attributes,.debug_info,.debug_abbrev,.debug_loclists,.debug_aranges,.debug_rnglists,.debug_line,.debug_str,.comment,.debug_frame,.debug_line_str,.symtab,.strtab,.shstrtab,.min_heap_stack" $< make-dir: @mkdir -p $(OBJECTDIRSTRUCT) diff --git a/software/exp/template/Makefile b/software/exp/template/Makefile index 449054b3..bf4c5c68 100644 --- a/software/exp/template/Makefile +++ b/software/exp/template/Makefile @@ -148,7 +148,7 @@ version: mem-usage: $(TARGET).elf @echo --------------------------------------------------------------------------- - @armmem -l $(LDSCRIPT) -d -h $< + @armmem -l $(LDSCRIPT) -d -h -z -e ".ARM,.ARM.attributes,.debug_info,.debug_abbrev,.debug_loclists,.debug_aranges,.debug_rnglists,.debug_line,.debug_str,.comment,.debug_frame,.debug_line_str,.symtab,.strtab,.shstrtab,.min_heap_stack" $< make-dir: @mkdir -p $(OBJECTDIRSTRUCT) diff --git a/software/pmc/Makefile b/software/pmc/Makefile index b5783766..8e1c799b 100644 --- a/software/pmc/Makefile +++ b/software/pmc/Makefile @@ -148,7 +148,7 @@ version: mem-usage: $(TARGET).elf @echo --------------------------------------------------------------------------- - @armmem -l $(LDSCRIPT) -d -h $< + @armmem -l $(LDSCRIPT) -d -h -z -e ".ARM,.ARM.attributes,.debug_info,.debug_abbrev,.debug_loclists,.debug_aranges,.debug_rnglists,.debug_line,.debug_str,.comment,.debug_frame,.debug_line_str,.symtab,.strtab,.shstrtab,.min_heap_stack" $< make-dir: @mkdir -p $(OBJECTDIRSTRUCT) diff --git a/software/rv/Makefile b/software/rv/Makefile index 83baf554..7c3c70d2 100755 --- a/software/rv/Makefile +++ b/software/rv/Makefile @@ -170,7 +170,7 @@ version: mem-usage: $(TARGET).elf @echo --------------------------------------------------------------------------- - @armmem -l $(LDSCRIPT) -d -h $< + @elfmem -l $(LDSCRIPT) -d -h -z -e ".riscv,.riscv.attributes,.debug_info,.debug_abbrev,.debug_loclists,.debug_aranges,.debug_rnglists,.debug_line,.debug_str,.debug_line_str,.comment,.debug_frame,.symtab,.strtab,.shstrtab,.min_heap_stack" $< make-dir: @mkdir -p $(OBJECTDIRSTRUCT)