[FL-2263] Flasher service & RAM exec (#1006)
* WIP on stripping fw * Compact FW build - use RAM_EXEC=1 COMPACT=1 DEBUG=0 * Fixed uninitialized storage struct; small fixes to compact fw * Flasher srv w/mocked flash ops * Fixed typos & accomodated FFF changes * Alternative fw startup branch * Working load & jmp to RAM fw * +manifest processing for stage loader; + crc verification for stage payload * Fixed questionable code & potential leaks * Lowered screen update rate; added radio stack update stubs; working dfu write * Console EP with manifest & stage validation * Added microtar lib; minor ui fixes for updater * Removed microtar * Removed mtar #2 * Added a better version of microtar * TAR archive api; LFS backup & restore core * Recursive backup/restore * LFS worker thread * Added system apps to loader - not visible in UI; full update process with restarts * Typo fix * Dropped BL & f6; tooling for updater WIP * Minor py fixes * Minor fixes to make it build after merge * Ported flash workaround from BL + fixed visuals * Minor cleanup * Chmod + loader app search fix * Python linter fix * Removed usb stuff & float read support for staged loader == -10% of binary size * Added backup/restore & update pb requests * Added stub impl to RPC for backup/restore/update commands * Reworked TAR to use borrowed Storage api; slightly reduced build size by removing `static string`; hidden update-related RPC behind defines * Moved backup&restore to storage * Fixed new message types * Backup/restore/update RPC impl * Moved furi_hal_crc to LL; minor fixes * CRC HAL rework to LL * Purging STM HAL * Brought back minimal DFU boot mode (no gui); additional crc state checks * Added splash screen, BROKEN usb function * Clock init rework WIP * Stripped graphics from DFU mode * Temp fix for unused static fun * WIP update picker - broken! * Fixed UI * Bumping version * Fixed RTC setup * Backup to update folder instead of ext root * Removed unused scenes & more usb remnants from staged loader * CI updates * Fixed update bundle name * Temporary restored USB handler * Attempt to prevent .text corruption * Comments on how I spent this Saturday * Added update file icon * Documentation updates * Moved common code to lib folder * Storage: more unit tests * Storage: blocking dir open, differentiate file and dir when freed. * Major refactoring; added input processing to updater to allow retrying on failures (not very useful prob). Added API for extraction of thread return value * Removed re-init check for manifest * Changed low-level path manipulation to toolbox/path.h; makefile cleanup; tiny fix in lint.py * Increased update worker stack size * Text fixes in backup CLI * Displaying number of update stages to run; removed timeout in handling errors * Bumping version * Added thread cleanup for spawner thread * Updated build targets to exclude firmware bundle from 'ALL' * Fixed makefile for update_package; skipping VCP init for update mode (ugly) * Switched github build from ALL to update_package * Added +x for dist_update.sh * Cli: add total heap size to "free" command * Moved (RAM) suffix to build version instead of git commit no. * DFU comment * Some fixes suggested by clang-tidy * Fixed recursive PREFIX macro * Makefile: gather all new rules in updater namespace. FuriHal: rename bootloader to boot, isr safe delays * Github: correct build target name in firmware build * FuriHal: move target switch to boot * Makefile: fix firmware flash * Furi, FuriHal: move kernel start to furi, early init * Drop bootloader related stuff * Drop cube. Drop bootloader linker script. * Renamed update_hl, moved constants to #defines * Moved update-related boot mode to separate bitfield * Reworked updater cli to single entry point; fixed crash on tar cleanup * Added Python replacement for dist shell scripts * Linter fixes for dist.py +x * Fixes for environment suffix * Dropped bash scripts * Added dirty build flag to version structure & interfaces * Version string escapes * Fixed flag logic in dist.py; added support for App instances being imported and not terminating the whole program * Fixed fw address in ReadMe.md * Rpc: fix crash on double screen start * Return back original boot behavior and fix jump to system bootloader * Cleanup code, add error sequence for RTC * Update firmware readme * FuriHal: drop boot, restructure RTC registers usage and add header register check * Furi goes first * Toolchain: add ccache support * Renamed update bundle dir Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com> Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
21
make/git.mk
21
make/git.mk
@@ -2,7 +2,14 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD || echo 'unknown')
|
||||
GIT_BRANCH := $(shell echo $${WORKFLOW_BRANCH_OR_TAG-$$(git rev-parse --abbrev-ref HEAD || echo 'unknown')})
|
||||
GIT_BRANCH_NUM := $(shell git rev-list --count HEAD || echo 'nan')
|
||||
BUILD_DATE := $(shell date '+%d-%m-%Y' || echo 'unknown')
|
||||
BUILD_TIME := $(shell date '+%H:%M:%S' || echo 'unknown')
|
||||
VERSION := $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null || echo 'unknown')
|
||||
GIT_DIRTY_BUILD := $(shell git diff --quiet ; echo $$?)
|
||||
|
||||
GIT_DIRTY_SUFFIX :=
|
||||
ifeq ($(GIT_DIRTY_BUILD), 1)
|
||||
GIT_DIRTY_SUFFIX := -dirty
|
||||
endif
|
||||
|
||||
CFLAGS += \
|
||||
-DGIT_COMMIT=\"$(GIT_COMMIT)\" \
|
||||
@@ -10,4 +17,16 @@ CFLAGS += \
|
||||
-DGIT_BRANCH_NUM=\"$(GIT_BRANCH_NUM)\" \
|
||||
-DBUILD_DATE=\"$(BUILD_DATE)\" \
|
||||
-DVERSION=\"$(VERSION)\" \
|
||||
-DTARGET=$(HARDWARE_TARGET)
|
||||
-DTARGET=$(HARDWARE_TARGET) \
|
||||
-DBUILD_DIRTY=$(GIT_DIRTY_BUILD)
|
||||
|
||||
# if suffix is set in environment (by Github), use it
|
||||
ifeq (${DIST_SUFFIX},)
|
||||
DIST_SUFFIX := local-$(GIT_COMMIT)$(GIT_DIRTY_SUFFIX)
|
||||
else
|
||||
DIST_SUFFIX := ${DIST_SUFFIX}$(GIT_DIRTY_SUFFIX)
|
||||
endif
|
||||
|
||||
#VERSION_STRING := $(VERSION) ($(GIT_BRANCH) @ $(GIT_COMMIT)), built $(BUILD_DATE) $(BUILD_TIME)
|
||||
VERSION_STRING := $(DIST_SUFFIX), $(GIT_BRANCH)
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
OBJ_DIR := $(OBJ_DIR)/$(TARGET)
|
||||
OBJ_DIR := $(OBJ_DIR)/$(TARGET)-$(PROJECT)
|
||||
|
||||
# Include source folder paths to virtual paths
|
||||
C_SOURCES := $(abspath ${C_SOURCES})
|
||||
@@ -22,6 +22,7 @@ endif
|
||||
$(foreach dir, $(OBJECT_DIRS),$(shell mkdir -p $(dir)))
|
||||
|
||||
BUILD_FLAGS_SHELL=\
|
||||
echo $(OBJ_DIR) ;\
|
||||
echo "$(CFLAGS)" > $(OBJ_DIR)/BUILD_FLAGS.tmp; \
|
||||
diff -u $(OBJ_DIR)/BUILD_FLAGS $(OBJ_DIR)/BUILD_FLAGS.tmp 2>&1 > /dev/null \
|
||||
&& ( echo "CFLAGS ok"; rm $(OBJ_DIR)/BUILD_FLAGS.tmp) \
|
||||
@@ -48,7 +49,7 @@ $(OBJ_DIR)/$(PROJECT).elf: $(OBJECTS)
|
||||
$(OBJ_DIR)/$(PROJECT).hex: $(OBJ_DIR)/$(PROJECT).elf
|
||||
@echo "\tHEX\t" $@
|
||||
@$(HEX) $< $@
|
||||
|
||||
|
||||
$(OBJ_DIR)/$(PROJECT).bin: $(OBJ_DIR)/$(PROJECT).elf
|
||||
@echo "\tBIN\t" $@
|
||||
@$(BIN) $< $@
|
||||
|
@@ -4,12 +4,14 @@ OS := $(shell uname -s)
|
||||
ifeq ($(TOOLCHAIN), arm)
|
||||
PREFIX = arm-none-eabi-
|
||||
ifdef GCC_PATH
|
||||
PREFIX = $(GCC_PATH)/$(PREFIX)
|
||||
PREFIX := $(GCC_PATH)/$(PREFIX)
|
||||
endif
|
||||
endif
|
||||
|
||||
CC = $(PREFIX)gcc -std=gnu17
|
||||
CPP = $(PREFIX)g++ -std=gnu++17
|
||||
CCACHE := $(shell which ccache)
|
||||
|
||||
CC = $(CCACHE) $(PREFIX)gcc -std=gnu17
|
||||
CPP = $(CCACHE) $(PREFIX)g++ -std=gnu++17
|
||||
LD = $(PREFIX)g++
|
||||
AS = $(PREFIX)gcc -x assembler-with-cpp
|
||||
CP = $(PREFIX)objcopy
|
||||
@@ -17,6 +19,7 @@ SZ = $(PREFIX)size
|
||||
HEX = $(CP) -O ihex
|
||||
BIN = $(CP) -O binary -S
|
||||
|
||||
|
||||
ifeq ($(OS), Darwin)
|
||||
GDB = gdb
|
||||
else
|
||||
|
Reference in New Issue
Block a user