Diff: mbed_app.json

Revision:

10:b27c962b3c3f

Parent:

9:265744785d33

Child:

14:2f3456616212

--- a/mbed_app.json	Sun Oct 14 19:01:53 2018 +0100
+++ b/mbed_app.json	Sat Dec 08 01:46:22 2018 +0000
@@ -1,53 +1,47 @@
 {
     "macros": [
-        "MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\"",
-        "PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
+        "ARM_UC_USE_PAL_BLOCKDEVICE=1",
+        "MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
         "MBED_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
         "MBED_CLOUD_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
-        "PAL_DTLS_PEER_MIN_TIMEOUT=5000",
-        "MBED_CONF_APP_MAIN_STACK_SIZE=7000",
-        "ARM_UC_USE_PAL_BLOCKDEVICE=1",
-        "MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
+        "PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
+        "PAL_FS_MOUNT_POINT_PRIMARY=\"/fs\"",
+        "MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\"",
+        "PAL_DTLS_PEER_MIN_TIMEOUT=5000"
     ],
     "target_overrides": {
         "*": {
-            "platform.stdio-baud-rate": 115200,
+            "platform.stdio-baud-rate"          : 115200,
             "platform.stdio-convert-newlines"   : true,
             "update-client.storage-address"     : "(1024*1024*64)",
             "update-client.storage-size"        : "(1024*1024*2)",
             "update-client.storage-locations"   : "1",
             "mbed-trace.enable"                 : null,
             "nsapi.default-wifi-security"       : "WPA_WPA2",
-            "nsapi.default-wifi-ssid"           : "\"SSID\"",
-            "nsapi.default-wifi-password"       : "\"Password\""
+            "nsapi.default-wifi-ssid"           : "\"RD2\"",
+            "nsapi.default-wifi-password"       : "\"mimieli1\""
         },
         "DISCO_L475VG_IOT01A": {
+            "target.features_add"               : ["BOOTLOADER"],
+            "target.components_add"             : ["QSPIF"],
+            "target.components_remove"          : ["FLASHIAP"],
+            "target.extra_labels_add"           : ["WIFI_ISM43362"],
             "target.network-default-interface-type" : "WIFI",
-            "target.features_add"               : ["STORAGE", "BOOTLOADER"],
-            "target.components_add"             : ["SD"],
-            "sd.SPI_MOSI"                       : "D11",
-            "sd.SPI_MISO"                       : "D12",
-            "sd.SPI_CLK"                        : "D13",
-            "sd.SPI_CS"                         : "D10",
-            "target.app_offset"                 : "0x10400",
-            "target.header_offset"              : "0x10000",
-            "target.bootloader_img"             : "bootloader/mbed-bootloader-L475VG.bin",
-            "sotp-section-1-address"            : "(0x08000000+((1024-4)*1024))",
+            "flash-start-address"               : "0x08000000",
+            "flash-size"                        : "(1024*1024)",
+            "sotp-section-1-address"            : "(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - 2*(2*1024))",
             "sotp-section-1-size"               : "(2*1024)",
-            "sotp-section-2-address"            : "(0x08000000+((1024-2)*1024))",
+            "sotp-section-2-address"            : "(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - 1*(2*1024))",
             "sotp-section-2-size"               : "(2*1024)",
             "sotp-num-sections"                 : 2,
-            "update-client.application-details" : "(0x08000000+64*1024)",
-            "update-client.bootloader-details"  : "0x080082A0"
-        },
-        "DISCO_F413ZH": {
-            "sotp-section-1-address"            : "(0x08000000+((1536-256)*1024))",
-            "sotp-section-1-size"               : "(128*1024)",
-            "sotp-section-2-address"            : "(0x08000000+((1536-128)*1024))",
-            "sotp-section-2-size"               : "(128*1024)",
-            "sotp-num-sections"                 : 2
+            "target.bootloader_img"             : "bootloader/mbed-bootloader-DISCO_L475VG_IOT01A.bin",
+            "target.header_offset"              : "0x10000",
+            "target.app_offset"                 : "0x10400",
+            "update-client.application-details" : "(MBED_CONF_APP_FLASH_START_ADDRESS + 64*1024)",
+            "update-client.storage-address"     : "(1024*1024*2)",
+            "update-client.storage-size"        : "(1024*1024*2)",
+            "update-client.storage-locations"   : 1
         }
-
     },
     "config": {
         "format-storage-layer-on-error": {
@@ -58,6 +52,17 @@
             "help": "Enable Developer mode to skip Factory enrollment",
             "value": 1
         },
+        "main-stack-size": {
+            "value": 6000
+        },
+        "flash-start-address": {
+            "help": "Start address of internal flash. Only used in this config to help the definition of other macros.",
+            "value": null
+        },
+        "flash-size": {
+            "help": "Total size of internal flash. Only used in this config to help the definition of other macros.",
+            "value": null
+        },
         "sotp-section-1-address": {
             "help": "Flash sector address for SOTP sector 1",
             "macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
@@ -84,4 +89,4 @@
             "value": null
         }
     }
-}
+}
\ No newline at end of file