Upload recipe-make-cat5 1.3.1.6076 [2846]

Infineon · Nov 4, 2024 · 77cd03e · 77cd03e
1 parent 2efe20a
commit 77cd03e
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 49 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -16,6 +16,9 @@ This release of the CYW55513/CYW55913 GNU make build recipe includes complete su
 This also includes the getlibs.bash script that can be used directly, or via the make target to download additional git repo based libraries for the application.
 
 ### What Changed?
+#### v1.3.1
+* Minor bug fixes
+
 #### v1.3.0
 * Optimization for speed changed to optimization for size for the IAR toolchain
 * The feature of setting the default location of the ARM and IAR toolchains has been deprecated

diff --git a/make/recipe/defines.mk b/make/recipe/defines.mk
@@ -110,34 +110,43 @@ endif
 ifeq ($(XIP),0)
 APPEXEC=ram
 endif
+# set up to handle app Makefile with PSRAM=1
+PSRAM?=0
+ifeq ($(PSRAM),1)
+# if PSRAM=1, then XIP=0
+XIP=0
+APPEXEC=psram
+endif
+
 APPEXEC?=flash
 
 # APPEXEC provides the preferred application execution location
+# DIRECT_LOAD is undefined and defaults to 1 for 55513 kit
+# the non-generated linker scripts for DIRECT_LOAD=1 are *_direct_load_ram.*
+ifneq ($(DIRECT_LOAD),0)
+_MTB_RECIPE__XIP_FLASH:=
+APPEXEC=direct_load_ram
+else
 ifeq ($(APPEXEC),flash)
 XIP=1
 else
 ifeq ($(APPEXEC),psram)
 PSRAM=1
 else
 ifeq ($(APPEXEC),ram)
-XIP=0
-PSRAM=0
+XIP=
+PSRAM=
 else
-ifneq ($(DIRECT_LOAD),0)
-XIP=0
-PSRAM=0
+ifeq ($(APPEXEC),direct_load_ram)
+_MTB_RECIPE__XIP_FLASH:=
+APPEXEC=direct_load_ram
+DIRECT_LOAD=1
 else
-$(error APPEXEC must be defined as flash, ram, or psram)
+$(error APPEXEC must be defined as flash, ram, psram, or direct_load_ram)
 endif
 endif
 endif
 endif
-
-# set up to handle app Makefile with PSRAM=1
-PSRAM?=0
-ifeq ($(PSRAM),1)
-# if PSRAM=1, then XIP=0
-XIP=0
 endif
 
 ifeq ($(DIRECT_LOAD),1)

diff --git a/make/recipe/recipe.mk b/make/recipe/recipe.mk
@@ -166,8 +166,27 @@ CY_RECIPE_EXTRA_LIBS:=$(MTB_RECIPE__EXTRA_LIBS)
 # Prebuild and precompile steps
 #
 ifeq ($(LIBNAME),)
-ifeq ($(LINKER_SCRIPT),)
+#
+# define a macro to check for command line changes in recipes
+# $(call _mtb_recipe__cli_change_check,<cli text>,<cli text file>)
+define _mtb_recipe__cli_change_check
+	$(MTB__NOISE)if [ -f "$2" ]; then \
+	  echo "setting file exists: $2"; \
+	  echo "$1" > "$2.tmp"; \
+	  if ! cmp -s "$2" "$2.tmp"; then \
+	    echo "setting change detected"; \
+	    mv -f "$2.tmp" "$2"; \
+	  else \
+	    rm -f "$2.tmp"; \
+	    exit 0; \
+	  fi; \
+	else \
+	  echo "$1" > "$2"; \
+	fi; \
+	$1
+endef
 
+ifeq ($(LINKER_SCRIPT),)
 #
 # if no linker script given, generate linker script
 #
@@ -190,6 +209,8 @@ CY_RECIPE_PREBUILD?=\
 
 endif # ifeq ($(LINKER_SCRIPT),)
 
+CY_RECIPE_PREBUILD_FILE=$(MTB_TOOLS__OUTPUT_CONFIG_DIR)/.cyrecipe_prebuild.txt
+
 #
 # for PRECOMPILE recipe, filter all object files by asset search paths listed in PLACE_COMPONENT_IN_SRAM_PATH
 # set up input section matches to place asset code/rodata into SRAM
@@ -216,21 +237,27 @@ CY_RECIPE_PRECOMPILE?=\
 	sed -i.tmp 's|$(CY_INPUT_SECTION_MATCH)|\1 \
 	$(foreach o_file,$(notdir $(filter $(PLACE_COMPONENT_IN_SRAM_PATH_FILTER),\
 	$(patsubst $(MTB_TOOLS__OUTPUT_CONFIG_DIR)/ext/%,%,\
-	$(_MTB_CORE__BUILD_ALL_OBJ_FILES)))),\n\t\t*$(o_file) $(CY_INPUT_SECTION_SELECT))|' $(MTB_RECIPE__GENERATED_LINKER_SCRIPT);
+	$(_MTB_CORE__BUILD_ALL_OBJ_FILES)))),\n\t\t*$(o_file) $(CY_INPUT_SECTION_SELECT))|' $(MTB_RECIPE__GENERATED_LINKER_SCRIPT)
+
+CY_RECIPE_PRECOMPILE_FILE=$(MTB_TOOLS__OUTPUT_CONFIG_DIR)/.cyrecipe_precompile.txt
 
 # insert the additional PRECOMPILE recipe as precursor to _mtb_build_precompile and dependent on _mtb_build_gensrc
 bsp_prep_mod_linker_script: _mtb_build_gensrc
 
+# run recipe if 1st time or if it has changed
 bsp_mod_linker_script: $(MTB_RECIPE__GENERATED_LINKER_SCRIPT) bsp_prep_mod_linker_script
-	$(CY_RECIPE_PRECOMPILE)
+	$(call _mtb_recipe__cli_change_check,$(CY_RECIPE_PRECOMPILE),$(CY_RECIPE_PRECOMPILE_FILE))  $(MTB__SILENT_OUTPUT)
 
 _mtb_build_precompile: bsp_mod_linker_script
 
 # insert the additional PREBUILD recipe as precursor to project_prebuild and dependent on bsp_prebuild
 bsp_gen_ld_prep_prebuild: bsp_prebuild
 
-bsp_gen_ld_prebuild: bsp_gen_ld_prep_prebuild
-	$(CY_RECIPE_PREBUILD)
+$(MTB_RECIPE__GENERATED_LINKER_SCRIPT):
+	$(call _mtb_recipe__cli_change_check,$(CY_RECIPE_PREBUILD),$(CY_RECIPE_PREBUILD_FILE))  $(MTB__SILENT_OUTPUT)
+
+# run recipe if 1st time or if it has changed
+bsp_gen_ld_prebuild: $(MTB_RECIPE__GENERATED_LINKER_SCRIPT) bsp_gen_ld_prep_prebuild
 
 project_prebuild: bsp_gen_ld_prebuild
 endif # ifeq ($(LIBNAME),)
@@ -283,11 +310,15 @@ _MTB_RECIPE__POSTBUILD:=\
 
 endif
 
+_MTB_RECIPE__POSTBUILD_FILE=$(MTB_TOOLS__OUTPUT_CONFIG_DIR)/.cyrecipe_postbuild.txt
+
+# run postbuild if elf was updated vs hex
 $(MTB_TOOLS__OUTPUT_CONFIG_DIR)/$(APPNAME).hex: $(MTB_TOOLS__OUTPUT_CONFIG_DIR)/$(APPNAME).elf
-	$(MTB__NOISE)$(_MTB_RECIPE__POSTBUILD) $(MTB__SILENT_OUTPUT)
+	$(_MTB_RECIPE__POSTBUILD)
 
+# run postbuild if elf was updated vs hcd
 $(MTB_TOOLS__OUTPUT_CONFIG_DIR)/$(APPNAME).hcd: $(MTB_TOOLS__OUTPUT_CONFIG_DIR)/$(APPNAME).elf
-	$(MTB__NOISE)$(_MTB_RECIPE__POSTBUILD) $(MTB__SILENT_OUTPUT)
+	$(_MTB_RECIPE__POSTBUILD)
 
 recipe_postbuild: $(MTB_TOOLS__OUTPUT_CONFIG_DIR)/$(APPNAME).hex
 

diff --git a/make/scripts/bt_post_build.bash b/make/scripts/bt_post_build.bash
@@ -283,18 +283,6 @@ CY_APP_HEX_SS="$CY_MAINAPP_BUILD_DIR/${CY_MAINAPP_NAME}_ss.hex"
 CY_APP_HCD="$CY_MAINAPP_BUILD_DIR/${CY_MAINAPP_NAME}_download.hcd"
 CY_APP_MAP="$CY_MAINAPP_BUILD_DIR/${CY_MAINAPP_NAME}.map"
 
-# check dependencies - only rebuild when needed
-if [ -e "$CY_APP_HEX" ]; then
-    echo "hex file already exists"
-    if [ "$CY_APP_HEX" -nt "$CY_MAINAPP_BUILD_DIR/$CY_ELF_NAME" ]; then
-      echo
-      echo "hex file is newer than elf, skipping post-build operations"
-      echo "make clean to refresh hex if needed"
-      echo
-      exit 0
-    fi
-fi
-
 # set up some tools that may be native and not modus-shell
 CY_TOOL_WC=wc
 CY_TOOL_SYNC=sync

diff --git a/make/scripts/bt_post_build_xip.bash b/make/scripts/bt_post_build_xip.bash
@@ -289,17 +289,6 @@ CY_APP_HEX_CERT="$CY_MAINAPP_BUILD_DIR/${CY_MAINAPP_NAME}_cert.hex"
 CY_APP_HCD="$CY_MAINAPP_BUILD_DIR/${CY_MAINAPP_NAME}_download.hcd"
 CY_APP_MAP="$CY_MAINAPP_BUILD_DIR/${CY_MAINAPP_NAME}.map"
 
-# check dependencies - only rebuild when needed
-if [ -e "$CY_APP_HEX" ]; then
-    echo "hex file already exists"
-    if [ "$CY_APP_HEX" -nt "$CY_MAINAPP_BUILD_DIR/$CY_ELF_NAME" ]; then
-      echo
-      echo "hex file is newer than elf, skipping post-build operations"
-      echo "make clean to refresh hex if needed"
-      echo
-      exit 0
-    fi
-fi
 
 # set up some tools that may be native and not modus-shell
 CY_TOOL_WC=wc

diff --git a/make/scripts/bt_pre_build.bash b/make/scripts/bt_pre_build.bash
@@ -115,12 +115,6 @@ if [ "$VERBOSE" != "" ]; then
 	echo 7: OVERLAY         : $CY_APP_OVERLAY
 fi
 
-# if *.ld exists, don't make a new one
-# we will always run this until we can have 'make clean' that removes *.ld
-if [ -e "$CY_APP_LD" ]; then
-    echo "$CY_APP_LD already present, use clean if it needs updating"
-    exit 0
-fi
 
 set +e
 

diff --git a/version.xml b/version.xml
@@ -1 +1 @@
-<version>1.3.0.6018</version>
+<version>1.3.1.6076</version>