liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor F2/local before F3 merge (#220)

Browse Source 
* add files from f3
* rollback lfs
* Move assets from LFS
* remove lfs from build

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
coreglitch
2020-11-06 14:31:59 +06:00
committed by GitHub
parent 841cae99ef
commit eb2679b982
106 changed files with 879 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
make/base.mk
View File

@@ -2,4 +2,9 @@ OBJ_DIR = .obj
ASM_SOURCES =
C_SOURCES =
CPP_SOURCES =
ASSETS =
ASSETS =
DEBUG_AGENT =
CFLAGS =
CPPFLAGS =
LDFLAGS =

22
make/rules.mk
View File

@@ -11,7 +11,7 @@ OBJECTS += $(addprefix $(OBJ_DIR)/, $(notdir $(CPP_SOURCES:.cpp=.o)))
# Generate dependencies
DEPS = $(OBJECTS:.o=.d)
$(shell mkdir -p $(OBJ_DIR))
$(shell test -d $(OBJ_DIR) || mkdir -p $(OBJ_DIR))
BUILD_FLAGS_SHELL=\
echo "$(CFLAGS)" > $(OBJ_DIR)/BUILD_FLAGS.tmp; \
@@ -71,14 +71,27 @@ flash: $(OBJ_DIR)/flash
upload: $(OBJ_DIR)/upload
debug: flash
set -m; st-util -n --semihosting & echo $$! > $(OBJ_DIR)/st-util.PID
$(DEBUG_AGENT) & echo $$! > $(OBJ_DIR)/agent.PID
arm-none-eabi-gdb \
-ex "target extended-remote 127.0.0.1:4242" \
-ex "set confirm off" \
-ex "source ../debug/FreeRTOS/FreeRTOS.py" \
$(OBJ_DIR)/$(PROJECT).elf; \
kill `cat $(OBJ_DIR)/st-util.PID`; \
rm $(OBJ_DIR)/st-util.PID
kill `cat $(OBJ_DIR)/agent.PID`; \
rm $(OBJ_DIR)/agent.PID
bm_debug: flash
set -m; blackmagic & echo $$! > $(OBJ_DIR)/agent.PID
arm-none-eabi-gdb \
-ex "target extended-remote 127.0.0.1:2000" \
-ex "set confirm off" \
-ex "monitor debug_bmp enable"\
-ex "monitor swdp_scan"\
-ex "attach 1"\
-ex "source ../debug/FreeRTOS/FreeRTOS.py" \
$(OBJ_DIR)/$(PROJECT).elf; \
kill `cat $(OBJ_DIR)/agent.PID`; \
rm $(OBJ_DIR)/agent.PID
clean:
@echo "\tCLEAN\t"
@@ -95,6 +108,7 @@ zzz: clean
$(MAKE) debug
FORMAT_SOURCES := $(shell find ../applications -iname "*.h" -o -iname "*.c" -o -iname "*.cpp")
FORMAT_SOURCES += $(shell find ../bootloader -iname "*.h" -o -iname "*.c" -o -iname "*.cpp")
FORMAT_SOURCES += $(shell find ../core -iname "*.h" -o -iname "*.c" -o -iname "*.cpp")
format:

6
make/toolchain.mk
View File

@@ -21,6 +21,6 @@ else
CFLAGS += -DNDEBUG -Os
endif
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
CPPFLAGS = -fno-threadsafe-statics
LDFLAGS += -Wl,-Map=$(OBJ_DIR)/$(PROJECT).map,--cref -Wl,--gc-sections -Wl,--undefined=uxTopUsedPriority
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
CPPFLAGS += -fno-threadsafe-statics
LDFLAGS += -Wl,-Map=$(OBJ_DIR)/$(PROJECT).map,--cref -Wl,--gc-sections -Wl,--undefined=uxTopUsedPriority