psoc64: Resolve compile and runtime issues

- Remove CY8CKIT_064B0S2_4343W_NPSA target
- Reserve 32KB non-secure flash for KV storage
  This is based on Devaraj's patch
     #13243 (comment)

- Relocate policy file to policy directory

Signed-off-by: Charley Chu <[email protected]>

Author: Charley Chu

features/storage/kvstore/conf/tdb_internal/mbed_lib.json

@@ -41,6 +41,10 @@
         },
         "MCU_PSOC6": {
             "internal_size": "0x10000"
+        },
+        "CY8CKIT_064B0S2_4343W": {
+            "internal_size": "0x8000",
+            "internal_base_address": "0x10168000"
         }
     }
 }

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/partition/flash_layout.h

@@ -25,7 +25,8 @@
  * Flash layout if BL2 not defined:
  *
  * 0x1000_0000 Secure     image primary (320 KB)
- * 0x1005_0000 Non-secure image primary (1152 KB)
+ * 0x1005_0000 Non-secure image primary (1120 KB)
+ * 0x1016_8000 Non-secure KV Storage (32 KB)
  * 0x1017_0000 Secure     image secondary (320 KB)
  * 0x101c_0000 - 0x101f_ffff Reserved
  *  0x101c_0000 Internal Trusted Storage Area (16 KB)
@@ -49,7 +50,7 @@
 /* The size of S partition */
 #define FLASH_S_PARTITION_SIZE          0x50000      /* 320 KB */
 /* The size of NS partition */
-#define FLASH_NS_PARTITION_SIZE         0x120000     /* 1152 KB */
+#define FLASH_NS_PARTITION_SIZE         0x118000     /* 1120 KB */
 
 /* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
 #define FLASH_AREA_IMAGE_SECTOR_SIZE    (0x200)      /* 512 B */

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/policy_multi_CM0_CM4_tfm.json renamed to targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/policy/policy_multi_CM0_CM4_tfm.json

@@ -149,12 +149,12 @@
                     {
                         "type": "BOOT",
                         "address": 268763136,
-                        "size": 1179648
+                        "size": 1146880
                     },
                     {
                         "type": "UPGRADE",
                         "address": 402653184,
-                        "size": 1179648
+                        "size": 1146880
                     }
                 ]
             }

targets/targets.json

@@ -6881,21 +6881,6 @@
         "tfm_delivery_dir": "TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W",
         "TFM_OUTPUT_EXT": "hex"
     },
-    "CY8CKIT_064B0S2_4343W_NPSA": {
-        "inherits": [
-            "CY8CKIT_064B0S2_4343W"
-        ],
-        "features_remove": [
-            "PSA"
-        ],
-        "extra_labels_remove": [
-            "TFM",
-            "TFM_DUALCPU"
-        ],
-        "hex_filename": "psoc6_02_cm0p_secure.hex",
-        "boot_scheme": "single_image",
-        "policy_file": "policy_single_CM0_CM4.json"
-    },
     "CYSBSYSKIT_01": {
         "inherits": [
             "MCU_PSOC6_M4"