bugfix: sdkconfig definitions not picked up

SmingHub · Jun 24, 2024 · 78f0b61 · 78f0b61
1 parent 6f14891
commit 78f0b61
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Sming/Arch/Esp32/Components/esp32/component.mk b/Sming/Arch/Esp32/Components/esp32/component.mk
@@ -66,6 +66,15 @@ endif
 ESP32_COMPONENT_PATH := $(COMPONENT_PATH)
 SDK_DEFAULT_PATH := $(ESP32_COMPONENT_PATH)/sdk
 
+SDK_PROJECT_PATH := $(ESP32_COMPONENT_PATH)/project/$(ESP_VARIANT)/$(BUILD_TYPE)
+SDK_CONFIG_DEFAULTS := $(SDK_PROJECT_PATH)/sdkconfig.defaults
+
+SDKCONFIG_MAKEFILE := $(SDK_PROJECT_PATH)/sdkconfig
+ifeq ($(MAKE_DOCS),)
+-include $(SDKCONFIG_MAKEFILE)
+endif
+export SDKCONFIG_MAKEFILE  # sub-makes (like bootloader) will reuse this path
+
 ifdef IDF_VERSION_52
 GLOBAL_CFLAGS += \
 	-DSOC_XTAL_FREQ_MHZ=CONFIG_XTAL_FREQ \
@@ -413,15 +422,6 @@ EXTRA_LDFLAGS += \
 	-T sections.ld
 endif
 
-SDK_PROJECT_PATH := $(ESP32_COMPONENT_PATH)/project/$(ESP_VARIANT)/$(BUILD_TYPE)
-SDK_CONFIG_DEFAULTS := $(SDK_PROJECT_PATH)/sdkconfig.defaults
-
-SDKCONFIG_MAKEFILE := $(SDK_PROJECT_PATH)/sdkconfig
-ifeq ($(MAKE_DOCS),)
--include $(SDKCONFIG_MAKEFILE)
-endif
-export SDKCONFIG_MAKEFILE  # sub-makes (like bootloader) will reuse this path
-
 FLASH_BOOT_LOADER       := $(SDK_BUILD_BASE)/bootloader/bootloader.bin
 FLASH_BOOT_CHUNKS		:= $(CONFIG_BOOTLOADER_OFFSET_IN_FLASH)=$(FLASH_BOOT_LOADER)