mirror of
https://github.com/oopuuu/zTC1.git
synced 2025-12-14 22:18:14 +08:00
修复代码错误
This commit is contained in:
30
mico-os/makefiles/images_download.mk
Normal file → Executable file
30
mico-os/makefiles/images_download.mk
Normal file → Executable file
@@ -35,33 +35,13 @@ endef
|
||||
|
||||
# MACRO: BUILD_IMAGE_DOWNLOAD_DEPENDENCY
|
||||
define BUILD_IMAGE_DOWNLOAD_DEPENDENCY
|
||||
$(if $($(1)),$(eval $(1)_DOWNLOAD_DEPENDENCY := $($(1)) $(CURRENT_DEPENDENCY) sflash_write_app display_map_summary $(EXT_IMAGES_DOWNLOAD_DEP) IMAGES_DOWNLOAD_RULES $(LINK_APPS_FILE) EXT_FILESYSTEM_IMAGE_DOWNLOAD) ,)
|
||||
$(if $($(1)),$(eval $(1)_DOWNLOAD_DEPENDENCY := $($(1)) $(CURRENT_DEPENDENCY) sflash_write_app display_map_summary $(EXT_IMAGES_DOWNLOAD_DEP) IMAGES_DOWNLOAD_RULES $(LINK_APPS_FILE)),)
|
||||
$(if $($(1)),$(eval CURRENT_DEPENDENCY += $(1)_DOWNLOAD),)
|
||||
endef
|
||||
#### end of BUILD_IMAGE_DOWNLOAD_DEPENDENCY
|
||||
|
||||
IMAGES_DOWNLOADS_DEPENDENCY :=
|
||||
FILE_RESOURCE :=
|
||||
#### add download filesystem image
|
||||
ifeq ($(APP_FULL), bootloader)
|
||||
FILE_BUILD_RESOURCE :=
|
||||
else
|
||||
ifeq ($(APP_FULL), sub_build/spi_flash_write)
|
||||
FILE_BUILD_RESOURCE :=
|
||||
else
|
||||
FILE_BUILD_RESOURCE := $(APP_FULL)/resources
|
||||
endif
|
||||
endif
|
||||
ifeq ($(wildcard $(FILE_BUILD_RESOURCE)),)
|
||||
FILE_RESOURCE :=
|
||||
else
|
||||
FILE_RESOURCE := build/$(CLEANED_BUILD_STRING)/resources/filesystem.bin
|
||||
endif
|
||||
ifeq ($(FILE_RESOURCE),)
|
||||
IMAGES := WIFI_FIRMWARE BT_PATCH_FIRMWARE BOOTLOAD_FIRMWARE APPLICATION_FIRMWARE ATE_FIRMWARE PARAMETER_1_IMAGE PARAMETER_2_IMAGEFILESYSTEM_IMAGE
|
||||
else
|
||||
IMAGES := WIFI_FIRMWARE FILESYSTEM_IMAGE BT_PATCH_FIRMWARE BOOTLOAD_FIRMWARE APPLICATION_FIRMWARE ATE_FIRMWARE PARAMETER_1_IMAGE PARAMETER_2_IMAGEFILESYSTEM_IMAGE
|
||||
endif
|
||||
$(foreach IMAGE,$(IMAGES),$(eval $(if $($(IMAGE)), IMAGES_DOWNLOADS_DEPENDENCY += $(IMAGE)_DOWNLOAD)))
|
||||
$(foreach IMAGE,$(IMAGES),$(eval $(call BUILD_IMAGE_DOWNLOAD_DEPENDENCY,$(IMAGE))))
|
||||
|
||||
@@ -84,10 +64,8 @@ endif
|
||||
|
||||
ifneq ($(FILESYSTEM_IMAGE),)
|
||||
FILESYSTEM_IMAGE_DOWNLOAD: $(FILESYSTEM_IMAGE_DOWNLOAD_DEPENDENCY)
|
||||
$(QUIET)$(ECHO) Downloading FILESYSTEM_IMAGE to partition: $(FILESYSTEM_IMAGE_PARTITION_TCL)
|
||||
$(call CONV_SLASHES,$(OPENOCD_FULL_NAME)) -f $(OPENOCD_CFG_PATH)interface/$(JTAG).cfg -f $(OPENOCD_CFG_PATH)$(HOST_OPENOCD)/$(HOST_OPENOCD).cfg -f $(MICO_OS_PATH)/sub_build/spi_flash_write/sflash_write.tcl -c "sflash_write_file $(FILE_RESOURCE) $(FILESYSTEM_IMAGE_PARTITION_TCL) 0x0 $(SFLASH_APP_PLATFROM_BUS) 0" -c shutdown $(DOWNLOAD_LOG) 2>&1 && $(ECHO) Download complete && $(ECHO_BLANK_LINE) || $(ECHO) Download failed
|
||||
$(QUIET)$(ECHO) Downloading resources filesystem ... $(FILESYSTEM_IMAGE) at sector $(FILESYSTEM_IMAGE_SECTOR_START) size $(FILESYSTEM_IMAGE_SECTOR_COUNT)...
|
||||
$(call CONV_SLASHES,$(OPENOCD_FULL_NAME)) -s $(SOURCE_ROOT) -f $(OPENOCD_CFG_PATH)interface/$(JTAG).cfg -f $(OPENOCD_CFG_PATH)$(HOST_OPENOCD)/$(HOST_OPENOCD).cfg -f apps/waf/sflash_write/sflash_write.tcl -c "sflash_write_file $(FILESYSTEM_IMAGE) $(FILESYSTEM_IMAGE_SECTOR_ADDRESS) $(SFLASH_APP_PLATFROM_BUS) 0" -c shutdown $(DOWNLOAD_LOG) 2>&1 && $(ECHO) Download complete && $(ECHO_BLANK_LINE) || $(ECHO) Download failed
|
||||
endif
|
||||
|
||||
|
||||
EXT_IMAGE_DOWNLOAD: sflash_write_app $(IMAGES_DOWNLOADS_DEPENDENCY)
|
||||
|
||||
EXT_FILESYSTEM_IMAGE_DOWNLOAD $(FILESYSTEM_IMAGE): sflash_gen_filesystem
|
||||
|
||||
Reference in New Issue
Block a user