Upload recipe-make-cat5 1.2.1.5248 [2329]

RELEASE.md

@@ -17,6 +17,11 @@ This release of the CYW55513 GNU make build recipe includes complete support for
 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.2.1
+* Fixed a bug causing image to not boot from RAM
+* Fixed a bug causing incorrect XIP alignment
+
 #### v1.2.0
 * CYW55513 device support added
 

make/scripts/bt_post_build_xip.bash

@@ -327,7 +327,16 @@ CY_APP_DIRECT_LOAD="DIRECT_LOAD=1"
 fi
 # generate the linker script
 if [[ $TOOLCHAIN = "ARM" ]]; then
+  if [[ $CY_APP_BUILD_EXTRAS = *"_FLASHPATCH_"* ]]; then
+    # need all types (CODE + RO + RW + ZI) minus XIP (APP_XIP_DATA)
+    APP_IRAM_LENGTH_RW=$("${CY_TOOL_PERL}" -ne 'printf("0x%X", $1) if /Total RW\s+Size .* (\d+) /' "${CY_APP_MAP}")
+    APP_IRAM_LENGTH_RO=$("${CY_TOOL_PERL}" -ne 'printf("0x%X", $1) if /Total RO\s+Size .* (\d+) /' "${CY_APP_MAP}")
+    APP_XIP_LENGTH=$("${CY_TOOL_PERL}" -ne 'print $1 if /Execution Region APP_XIP_AREA .* Size: (0x[0-9a-fA-F]+),/' "${CY_APP_MAP}")
+    APP_IRAM_LENGTH=$(printf 0x%X $((${APP_IRAM_LENGTH_RW} + ${APP_IRAM_LENGTH_RO} - ${APP_XIP_LENGTH})))
+  fi
+  if [[ $CY_APP_BUILD_EXTRAS = *"_FLASHAPP_"* ]]; then
     APP_IRAM_LENGTH=$("${CY_TOOL_PERL}" -ne 'printf("0x%X", $1) if /Total RW\s+Size .* (\d+) /' "${CY_APP_MAP}")
+  fi
 else
     APP_IRAM_LENGTH=$("${CY_TOOL_PERL}" -ne 'print "$1" if /(0x[0-9a-f]+)\s+app_iram_length/' "${CY_APP_MAP}")
 fi

make/scripts/wiced-gen-linker-script.pl

@@ -454,7 +454,7 @@ sub process_sections
     $section_name_lut->{'.app_xip_area'}->{start} = $param->{app_xip_start} if defined $param->{app_xip_start};
 
     # move common text and data section matches to app_xip_area if needed
-    if(defined $param->{XIP_DS_OFFSET} || defined $param->{xip_app}) {
+    if(defined $param->{XIP_DS_OFFSET_FLASH_APP} || defined $param->{xip_app}) {
         my @section_matches = @{$section_name_lut->{'.text'}->{match}};
         $section_name_lut->{'.text'}->{match} = [];
         # move input sections from ram to app_xip_area
@@ -546,7 +546,7 @@ sub process_sections
     else {
         # build the text for the scatter file based loosely on the ld file section_lut data structure
         # add some general matches for ARM scatter file sections
-        if(defined $param->{XIP_DS_OFFSET} || defined $param->{xip_app}) {
+        if(defined $param->{XIP_DS_OFFSET_FLASH_APP} || defined $param->{xip_app}) {
             push @{$section_name_lut->{'.app_xip_area'}->{match}}, '* (+RO)';
         }
         else {

version.xml

@@ -1 +1 @@
-<version>1.2.0.5186</version>
+<version>1.2.1.5248</version>