From 74f78540ae2bd66269a78d4ede57337f1347e806 Mon Sep 17 00:00:00 2001 From: Deomid Ryabkov Date: Wed, 21 Dec 2016 18:18:42 +0000 Subject: [PATCH] Allow providing custom PARTITION_TABLE_CSV_PATH Provide direct absolute path to CSV, without project_path --- components/partition_table/Makefile.projbuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/partition_table/Makefile.projbuild b/components/partition_table/Makefile.projbuild index 5d1e726a8..4d548f7e2 100644 --- a/components/partition_table/Makefile.projbuild +++ b/components/partition_table/Makefile.projbuild @@ -14,10 +14,12 @@ GEN_ESP32PART := $(PYTHON) $(COMPONENT_PATH)/gen_esp32part.py -q # Has a matching value in bootloader_support esp_flash_partitions.h PARTITION_TABLE_OFFSET := 0x8000 +ifndef PARTITION_TABLE_CSV_PATH # Path to partition CSV file is relative to project path for custom # partition CSV files, but relative to component dir otherwise.$ PARTITION_TABLE_ROOT := $(call dequote,$(if $(CONFIG_PARTITION_TABLE_CUSTOM),$(PROJECT_PATH),$(COMPONENT_PATH))) PARTITION_TABLE_CSV_PATH := $(call dequote,$(abspath $(PARTITION_TABLE_ROOT)/$(subst $(quote),,$(CONFIG_PARTITION_TABLE_FILENAME)))) +endif PARTITION_TABLE_BIN := $(BUILD_DIR_BASE)/$(notdir $(PARTITION_TABLE_CSV_PATH:.csv=.bin))