Make: Fix make bootloader, make bootloader-flash, cleaning of bootloader

Should resolve TW6610

components/bootloader/Makefile.projbuild

@@ -10,8 +10,9 @@
 #
 
 BOOTLOADER_COMPONENT_PATH := $(COMPONENT_PATH)
-EXTRA_CLEAN_TARGETS+=bootloader-clean
-BOOTLOADER_BIN=$(BUILD_DIR_BASE)/bootloader.bin
+EXTRA_CLEAN_TARGETS += bootloader-clean
+BOOTLOADER_BUILD_DIR=$(BUILD_DIR_BASE)/bootloader
+BOOTLOADER_BIN=$(BOOTLOADER_BUILD_DIR)/bootloader.bin
 
 .PHONY: bootloader-clean bootloader-flash bootloader
 
@@ -21,7 +22,7 @@ $(BOOTLOADER_BIN): $(COMPONENT_PATH)/src/sdkconfig
 	COMPONENT_INCLUDES= \
 	LDFLAGS= \
 	CFLAGS= \
-	BUILD_DIR_BASE=$(BUILD_DIR_BASE)/bootloader \
+	BUILD_DIR_BASE=$(BOOTLOADER_BUILD_DIR) \
 	make -C $(BOOTLOADER_COMPONENT_PATH)/src MAKEFLAGS= V=$(V) TARGET_BIN_LAYOUT="$(BOOTLOADER_TARGET_BIN_LAYOUT)"
 
 bootloader-clean:
@@ -30,10 +31,10 @@ bootloader-clean:
 	COMPONENT_INCLUDES= \
 	LDFLAGS= \
 	CFLAGS= \
-	BUILD_DIR_BASE=$(BUILD_DIR_BASE)/bootloader \
+	BUILD_DIR_BASE=$(BOOTLOADER_BUILD_DIR) \
 	make -C $(BOOTLOADER_COMPONENT_PATH)/src clean MAKEFLAGS= V=$(V)
 
-bootloader: $(BUILD_DIR_BASE)/bootloader.bin
+bootloader: $(BOOTLOADER_BIN)
 
 # synchronise the project level config to the component's
 # config
@@ -42,4 +43,4 @@ $(COMPONENT_PATH)/src/sdkconfig: $(PROJECT_PATH)/sdkconfig
 
 # bootloader-flash calls flash in the bootloader dummy project
 bootloader-flash: $(BOOTLOADER_BIN)
-	make -C $(BOOTLOADER_COMPONENT_PATH)/src flash MAKEFLAGS= V=$(V) CONFIG_APP_OFFSET=0x1000
+	make -C $(BOOTLOADER_COMPONENT_PATH)/src flash MAKEFLAGS= V=$(V)

components/bootloader/src/Makefile

@@ -10,3 +10,6 @@ COMPONENTS := esptool_py
 #adding it in the main/Makefile directory.
 
 include $(SDK_PATH)/make/project.mk
+
+# override configured app offset, as bootloader "app" is at 0x1000
+CONFIG_APP_OFFSET := 0x1000