Update armmem on embedded targets to elfmem

Signed-off-by: João Silva <jgc3silva@gmail.com>
vankxr · Jun 11, 2024 · 6f1c730 · 6f1c730
1 parent c383ce3
commit 6f1c730
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)