Skip to content

Commit

Permalink
Fix warnings when running make dist-clean
Browse files Browse the repository at this point in the history
  • Loading branch information
mikee47 committed Feb 7, 2021
1 parent 6b4aeb1 commit 2e76211
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
18 changes: 8 additions & 10 deletions Sming/Components/Storage/component.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,26 @@ HWCONFIG_TOOL := \
BUILD_BASE=$(BUILD_BASE) \
$(PYTHON) $(PARTITION_TOOLS)/hwconfig/hwconfig.py

ifeq (,$(MAKE_DOCS))
ifeq (,$(MAKE_DOCS)$(MAKE_CLEAN))

# Generate build variables from hardware configuration
HWCONFIG_MK := $(PROJECT_DIR)/$(OUT_BASE)/hwconfig.mk
$(shell $(HWCONFIG_TOOL) --quiet expr $(HWCONFIG) $(HWCONFIG_MK) "config.buildVars()")
include $(HWCONFIG_MK)
ifeq ($(SMING_ARCH_HW),)
$(error Hardware configuration error)
else ifneq ($(SMING_ARCH),$(SMING_ARCH_HW))
$(error Hardware configuration is for arch $(SMING_ARCH_HW), does not match SMING_ARCH ($(SMING_ARCH)))
endif
COMPONENT_CXXFLAGS := -DPARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET)

# Function to evaluate expression against config
HWEXPR := $(HWCONFIG_TOOL) $(if $(PART),--part "$(PART)") expr $(HWCONFIG) -

define HwExpr
$(shell $(HWEXPR) "$1")
endef

# Import PARTITION_TABLE_OFFSET from hardware configuration
DEBUG_VARS += PARTITION_TABLE_OFFSET
ifeq ($(SMING_ARCH_HW),)
$(error Hardware configuration error)
else ifneq ($(SMING_ARCH),$(SMING_ARCH_HW))
$(error Hardware configuration is for arch $(SMING_ARCH_HW), does not match SMING_ARCH ($(SMING_ARCH)))
endif
COMPONENT_CXXFLAGS := -DPARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET)


##@Configuration

Expand Down
2 changes: 1 addition & 1 deletion Sming/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ component-samples-clean: ##Clean all component samples

CLEAN_TESTS := $(TESTS_COMPLETED:complete=clean)
.PHONY: tests-clean
tests-clean: $(CLEAN_TESTS) ##Clean all test applications (all arch/build types)
tests-clean: $(wildcard $(CLEAN_TESTS)) ##Clean all test applications (all arch/build types)
-$(Q) rm -f $(TESTS_COMPLETED)

.PHONY: $(CLEAN_TESTS)
Expand Down

0 comments on commit 2e76211

Please sign in to comment.