commit 2516562fe35d0bc48d60d129324a683fba2f0480
author Roman Okhrimenko <roman.okhrimenko@infineon.com> Tue May 23 08:58:29 2023 +0300
committer Roman Okhrimenko <roman.okhrimenko@infineon.com> Tue May 23 08:59:37 2023 +0300
tree 523d90c7d0ba8a52f7e0808fe611f096e79d6733
parent f7a3d1bd2179350f392b856b3c07c45edb844b82

Infineon: Add support for cyw20829 b0 revision of device, update libs versions

boot/cypress/MCUBootApp/MCUBootApp.mk

diff --git a/boot/cypress/MCUBootApp/MCUBootApp.mk b/boot/cypress/MCUBootApp/MCUBootApp.mk
index e2dae9f..a90e488 100644
--- a/boot/cypress/MCUBootApp/MCUBootApp.mk
+++ b/boot/cypress/MCUBootApp/MCUBootApp.mk
@@ -34,8 +34,14 @@
 CUR_APP_PATH = $(PRJ_DIR)/$(APP_NAME)
 
 ifneq ($(FLASH_MAP), )
+#to 'Bit_per_cnt' generation for CYW20829
+ifeq ($(PLATFORM), CYW20829)
+$(CUR_APP_PATH)/flashmap.mk:
+	$(PYTHON_PATH) scripts/flashmap.py -p $(PLATFORM) -i $(FLASH_MAP) -o $(PRJ_DIR)/platforms/cy_flash_pal/cy_flash_map.h -c $(PRJ_DIR)/policy/policy_secure.json > $(CUR_APP_PATH)/flashmap.mk
+else
 $(CUR_APP_PATH)/flashmap.mk:
 	$(PYTHON_PATH) scripts/flashmap.py -p $(PLATFORM) -m -i $(FLASH_MAP) -o $(PRJ_DIR)/platforms/cy_flash_pal/cy_flash_map.h > $(CUR_APP_PATH)/flashmap.mk
+endif
 include $(CUR_APP_PATH)/flashmap.mk
 DEFINES_APP := -DCY_FLASH_MAP_JSON
 endif

boot/cypress/MCUBootApp/MCUBootApp_CM33.ld

diff --git a/boot/cypress/MCUBootApp/MCUBootApp_CM33.ld b/boot/cypress/MCUBootApp/MCUBootApp_CM33.ld
index e98f9e5..db3671f 100644
--- a/boot/cypress/MCUBootApp/MCUBootApp_CM33.ld
+++ b/boot/cypress/MCUBootApp/MCUBootApp_CM33.ld
@@ -48,8 +48,8 @@
 FLASH_START_ADDR_CBUS       = 0x08000000;
 RAM_START_ADDR_SAHB         = 0x20000000;
 RAM_START_ADDR_CBUS         = 0x04000000;
-RAM_END_ADDR_SAHB           = 0x20020000; /* 128K */
-RAM_END_ADDR_CBUS           = 0x04020000; /* 128K */
+RAM_END_ADDR_SAHB           = 0x20040000; /* 256K */
+RAM_END_ADDR_CBUS           = 0x04040000; /* 256K */
 FLASH_END_ADDR_SAHB         = 0x60080000; /* 512K */
 
 BOOTSTRAP_OFFSET_FLASH      = 0x00000050; /* toc2=0x10, l1_desc=0x1C, sign_header=0x20, padding=0x4 (encrypted data should be aligned to 0x10 boundary) */
@@ -83,7 +83,7 @@
 /* size of XIP region */
 XIP_SIZE                    = FLASH_END_ADDR_SAHB - XIP_LMA;
 /* Total size of SRAM */
-RAM_SIZE                    = RAM_END_ADDR_SAHB - RAM_START_ADDR_SAHB; /* 0x00020000 */
+RAM_SIZE                    = RAM_END_ADDR_SAHB - RAM_START_ADDR_SAHB; /* 0x00040000 */
 /* Size of Bootstrap data is kept same as BOOTSTRAP_SIZE */
 DATA_BS_SIZE                = BOOTSTRAP_SIZE;
 

boot/cypress/MCUBootApp/main.c

diff --git a/boot/cypress/MCUBootApp/main.c b/boot/cypress/MCUBootApp/main.c
index b54e7e5..8a78193 100644
--- a/boot/cypress/MCUBootApp/main.c
+++ b/boot/cypress/MCUBootApp/main.c
@@ -36,7 +36,7 @@
 #if defined APP_CM0P || defined CM4
 #include "cyw_platform_utils.h"
 #endif /* defined APP_CM0P || defined CM4  */
-#endif /* defined CYW20829 || defined EXPLORER  */
+#endif /* defined CYW20829 */
 
 #if defined(CY_BOOT_USE_EXTERNAL_FLASH) || defined(CYW20829)
 #include "flash_qspi.h"
@@ -167,7 +167,7 @@
 #error "Application should run on Cortex-M33"
 #endif /* APP_CM33 */
 
-#else /* defined CYW20829 || defined EXPLORER */
+#else /* defined CYW20829 */
 
 #ifdef USE_XIP
             BOOT_LOG_DBG("XIP: Switch to SMIF XIP mode");