Merge branch 'feature/support_make_size_family_cmd' into 'master'

esp8266: supports "make size" and its family function

See merge request sdk/ESP8266_RTOS_SDK!1033

Author: donghengqaz

components/esp8266/CMakeLists.txt

@@ -47,11 +47,13 @@ else()
     set(include_dirs "include" "include/driver")
 
     set(priv_requires "wpa_supplicant" "log" "spi_flash" "tcpip_adapter" "esp_ringbuf" "bootloader_support" "nvs_flash" "util")
+    set(fragments linker.lf ld/esp8266_fragments.lf)
 
     idf_component_register(SRCS "${srcs}"
                     INCLUDE_DIRS "${include_dirs}"
                     REQUIRES "${requires}"
                     PRIV_REQUIRES "${priv_requires}"
+                    LDFRAGMENTS "${fragments}"
                     REQUIRED_IDF_TARGETS esp8266)
 
     target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib" "-lstdc++")
@@ -73,7 +75,9 @@ else()
         endforeach()
     endif()
     target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/esp8266_out.ld")
-    target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/esp8266_common_out.ld")
+
+    target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_LIST_DIR}/ld/esp8266.project.ld.in" 
+                        PROCESS "${CMAKE_CURRENT_BINARY_DIR}/ld/esp8266.project.ld")
 
     target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp8266.rom.ld")
     target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp8266.peripherals.ld")
@@ -93,13 +97,7 @@ else()
         MAIN_DEPENDENCY ${LD_DIR}/esp8266.ld ${SDKCONFIG_H}
         COMMENT "Generating memory map linker script..."
         VERBATIM)
-    add_custom_command(
-        OUTPUT esp8266_common_out.ld
-        COMMAND "${CMAKE_C_COMPILER}" -C -P -x c -E -o esp8266_common_out.ld -I ${CONFIG_DIR} ${LD_DIR}/esp8266.common.ld
-        MAIN_DEPENDENCY ${LD_DIR}/esp8266.common.ld ${SDKCONFIG_H}
-        COMMENT "Generating section linker script..."
-        VERBATIM)
-    add_custom_target(esp8266_linker_script DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/esp8266_out.ld" "${CMAKE_CURRENT_BINARY_DIR}/esp8266_common_out.ld")
+    add_custom_target(esp8266_linker_script DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/esp8266_out.ld")
     add_dependencies(${COMPONENT_LIB} esp8266_linker_script)
 
     if(CONFIG_ESP8266_PHY_INIT_DATA_IN_PARTITION)

components/esp8266/Makefile.projbuild

@@ -64,6 +64,13 @@ endif # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION
 
 endif
 
+LINKER_SCRIPT_TEMPLATE := $(COMPONENT_PATH)/ld/esp8266.project.ld.in
+LINKER_SCRIPT_OUTPUT_DIR := $(abspath $(BUILD_DIR_BASE)/esp8266)
+
+# Target to generate linker script generator from fragments presented by each of
+# the components
+$(eval $(call ldgen_process_template,$(LINKER_SCRIPT_TEMPLATE),$(LINKER_SCRIPT_OUTPUT_DIR)/esp8266.project.ld))
+
 # global CFLAGS for ESP8266
 CFLAGS += -DICACHE_FLASH
 

components/esp8266/component.mk

@@ -25,11 +25,13 @@ endif
 #specifies its own scripts.
 LINKER_SCRIPTS += esp8266.rom.ld esp8266.peripherals.ld
 
+COMPONENT_ADD_LDFRAGMENTS += ld/esp8266_fragments.lf linker.lf
+
 COMPONENT_ADD_LDFLAGS += -L$(COMPONENT_PATH)/lib \
                          $(addprefix -l,$(LIBS)) \
                          -L $(COMPONENT_PATH)/ld \
                          -T esp8266_out.ld       \
-                         -T esp8266_common_out.ld \
+                         -T $(COMPONENT_BUILD_DIR)/esp8266.project.ld \
                          -Wl,--no-check-sections \
                          -u call_user_start      \
                          $(addprefix -T ,$(LINKER_SCRIPTS))
@@ -38,20 +40,18 @@ ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
 
 # final linking of project ELF depends on all binary libraries, and
 # all linker scripts
-COMPONENT_ADD_LINKER_DEPS := $(ALL_LIB_FILES) $(addprefix ld/,$(LINKER_SCRIPTS))
+COMPONENT_ADD_LINKER_DEPS := $(ALL_LIB_FILES) $(addprefix ld/, $(filter-out $(COMPONENT_BUILD_DIR)/esp8266.project.ld, $(LINKER_SCRIPTS))) \
+                             $(COMPONENT_BUILD_DIR)/esp8266.project.ld
 
 # Preprocess esp8266.ld linker script into esp8266_out.ld
 #
 # The library doesn't really depend on esp8266_out.ld, but it
 # saves us from having to add the target to a Makefile.projbuild
-$(COMPONENT_LIBRARY): esp8266_out.ld esp8266_common_out.ld
+$(COMPONENT_LIBRARY): esp8266_out.ld
 
 esp8266_out.ld: $(COMPONENT_PATH)/ld/esp8266.ld ../include/sdkconfig.h
 	$(CC) $(CFLAGS) -I ../include -C -P -x c -E $< -o $@
 
-esp8266_common_out.ld: $(COMPONENT_PATH)/ld/esp8266.common.ld ../include/sdkconfig.h
-	$(CC) -I ../include -C -P -x c -E $< -o $@
-
-COMPONENT_EXTRA_CLEAN := esp8266_out.ld
+COMPONENT_EXTRA_CLEAN := esp8266_out.ld $(COMPONENT_BUILD_DIR)/esp8266.project.ld
 
 endif

components/esp8266/include/esp8266/eagle_soc.h

@@ -181,7 +181,7 @@
 #define IRAM_SIZE                       (48 * 1024)
 
 #define FLASH_BASE                      (0x40200000)
-#define FLASH_SIZE                      (1 * 1024 * 1024)
+#define FLASH_SIZE                      (2 * 1024 * 1024)
 
 #define RTC_SYS_BASE                    (0x60001000)
 #define RTC_SYS_SIZE                    (0x200)