From f4c632bd313172ea7620f565f8ae048d3dbb262e Mon Sep 17 00:00:00 2001
From: gator96100 <jupuerzi@gmx.at>
Date: Wed, 30 Dec 2020 00:19:21 +0100
Subject: [PATCH] Added DEBUG_ARM flag

---
 .vscode/tasks.json      | 2 +-
 Makefile.defs           | 5 +++++
 common_arm/Makefile.hal | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 463377982..67f0f235e 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -71,7 +71,7 @@
         },{
             "label": "fullimage: clean & make debug",
             "type": "shell",
-            "command": "make armsrc/clean && make armsrc/all SKIP_COMPRESSION=1 DEBUG=1",
+            "command": "make armsrc/clean && make armsrc/all DEBUG_ARM=1",
             "problemMatcher": [
                 "$gcc"
             ],
diff --git a/Makefile.defs b/Makefile.defs
index 48567214b..b86b477aa 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -66,6 +66,11 @@ else
   DEFCFLAGS = -Wall -Werror -O3 -fstrict-aliasing -pipe
   DEFLDFLAGS =
 endif
+
+ifeq ($(DEBUG_ARM),1)
+  APP_CFLAGS += -g
+  SKIP_COMPRESSION=1
+endif
 # Next ones are activated only if SANITIZE=1
 ifeq ($(SANITIZE),1)
   DEFCFLAGS += -g -fsanitize=address -fno-omit-frame-pointer
diff --git a/common_arm/Makefile.hal b/common_arm/Makefile.hal
index b6519e4ab..bfbe56d34 100644
--- a/common_arm/Makefile.hal
+++ b/common_arm/Makefile.hal
@@ -138,7 +138,7 @@ ifneq ($(SKIP_HFPLOT),1)
     PLATFORM_DEFS += -DWITH_HFPLOT
 endif
 ifeq ($(SKIP_COMPRESSION),1)
-    PLATFORM_DEFS += -DWITH_NO_COMPRESSION -g
+    PLATFORM_DEFS += -DWITH_NO_COMPRESSION
 endif
 
 # Standalone mode