More updates

projects.yaml

@@ -30,63 +30,63 @@ module:
         - records/daplink/settings.yaml
         - records/daplink/settings_rom.yaml
         - records/daplink/interface.yaml
-    # HDKs
-    hdk_k20dx128: &module_hdk_k20dx128
+    # HIFs
+    hif_k20dx128: &module_hif_k20dx128
         - records/rtos/rtos-cm3.yaml
-        - records/hdk_hal/k20dx128.yaml
-    hdk_kl26z: &module_hdk_kl26z
+        - records/hif_hal/k20dx128.yaml
+    hif_kl26z: &module_hif_kl26z
         - records/rtos/rtos-cm0.yaml
-        - records/hdk_hal/kl26z.yaml
-    hdk_lpc11u35: &module_hdk_lpc11u35
+        - records/hif_hal/kl26z.yaml
+    hif_lpc11u35: &module_hif_lpc11u35
         - records/rtos/rtos-cm0.yaml
-        - records/hdk_hal/lpc11u35.yaml
-    hdk_sam3u2c: &module_hdk_sam3u2c
+        - records/hif_hal/lpc11u35.yaml
+    hif_sam3u2c: &module_hif_sam3u2c
         - records/rtos/rtos-cm3.yaml
-        - records/hdk_hal/sam3u2c.yaml
+        - records/hif_hal/sam3u2c.yaml
 
 projects:
     kl26z_bl:
         - *module_bl
-        - *module_hdk_kl26z
+        - *module_hif_kl26z
         - records/target/kl26z_bl.yaml
     k20dx_bl:
         - *module_bl
-        - *module_hdk_k20dx128
+        - *module_hif_k20dx128
         - records/target/k20dx128_bl.yaml
     sam3u2c_bl:
         - *module_bl
-        - *module_hdk_sam3u2c
+        - *module_hif_sam3u2c
         - records/target/sam3u2c_bl.yaml
     sam3u2c_nrf51822_if:
         - *module_if
-        - *module_hdk_sam3u2c
+        - *module_hif_sam3u2c
         - records/target/nrf51822_dk.yaml
     kl26z_nrf51822_if:
         - *module_if
-        - *module_hdk_kl26z
+        - *module_hif_kl26z
         - records/target/nrf51822.yaml
     kl26z_microbit_if:
         - *module_if
-        - *module_hdk_kl26z
+        - *module_hif_kl26z
         - records/target/nrf51822.yaml
         - records/overrides/microbit.yaml
     k20dx_k22f_if:
         - *module_if
-        - *module_hdk_k20dx128
+        - *module_hif_k20dx128
         - records/target/k22f.yaml
     k20dx_k64f_if:
         - *module_if
-        - *module_hdk_k20dx128
+        - *module_hif_k20dx128
         - records/target/k64f.yaml
     lpc11u35_lpc1114_if:
         - *module_if
-        - *module_hdk_lpc11u35
+        - *module_hif_lpc11u35
         - records/target/lpc1114.yaml
     lpc11u35_lpc812_if:
         - *module_if
-        - *module_hdk_lpc11u35
+        - *module_hif_lpc11u35
         - records/target/lpc812.yaml
     lpc11u35_efm32gg_stk_if:
         - *module_if
-        - *module_hdk_lpc11u35
+        - *module_hif_lpc11u35
         - records/target/efm32gg_stk.yaml

records/daplink/bootloader.yaml

@@ -6,7 +6,7 @@ common:
         - source/daplink
         - source/daplink/bootloader
         - source/cmsis-core
-        - source/hdk_hal
+        - source/hif_hal
     sources:
         daplink_bl:
             - source/daplink

records/daplink/interface.yaml

@@ -1,12 +1,12 @@
 common:
     macros:
         - DAPLINK_IF
-        - DAPLINK_BUILD_KEY=0x9B939699  # DAPLINK_BUILD_KEY_IF
+        - DAPLINK_BUILD_KEY=0x9B939E8F  # DAPLINK_BUILD_KEY_IF
     includes:
         - source/daplink
         - source/daplink/interface
         - source/cmsis-core
-        - source/hdk_hal
+        - source/hif_hal
     sources:
         daplink_if:
             - source/daplink

records/hif_hal/k20dx128.yaml

@@ -0,0 +1,45 @@
+common:
+    target:
+        - mk20dx128xxx5
+    macros:
+        - INTERFACE_K20D5
+        - CPU_MK20DX128VFM5
+        - DAPLINK_HIF_ID=0x97969900  # DAPLINK_HIF_ID_K20DX
+        - BL_TARGET_FLASH
+    includes:
+        - source/hif_hal/freescale/k20dx
+        - source/hif_hal/freescale/iap/devices/MK20D5
+        - source/hif_hal/freescale/k20dx
+        # fsl_flash_driver
+        - source/hif_hal/freescale/iap/driver
+        - source/hif_hal/freescale/iap/devices
+    sources:
+        hif_hal:
+            - source/hif_hal/freescale/k20dx
+            - source/hif_hal/freescale/iap/driver/flash_densities_k_series.c
+            - source/hif_hal/freescale/iap/devices/MK20D5
+            - source/hif_hal/freescale/k20dx
+            - source/hif_hal/freescale/k20dx/armcc
+        fsl_flash_driver:
+            - source/hif_hal/freescale/iap
+            - source/hif_hal/freescale/iap/driver/flash_init.c
+            - source/hif_hal/freescale/iap/driver/flash_erase.c
+            - source/hif_hal/freescale/iap/driver/flash_program.c
+            - source/hif_hal/freescale/iap/driver/flash_erase_all.c
+            - source/hif_hal/freescale/iap/driver/flash_verify_erase.c
+            - source/hif_hal/freescale/iap/driver/flash_get_property.c
+            - source/hif_hal/freescale/iap/driver/flash_verify_program.c
+            - source/hif_hal/freescale/iap/driver/flash_verify_erase_all.c
+            - source/hif_hal/freescale/iap/driver/flash_command_sequence.c
+
+tool_specific:
+    uvision:
+        misc:
+            ld_flags:
+                - --predefine="-I..\..\..\source\hif_hal\freescale\k20dx"
+            c_flags:
+                - --no_unaligned_access
+            cxx_flags:
+                - --no_unaligned_access
+            asm_flags:
+                - --no_unaligned_access

records/hif_hal/kl26z.yaml

@@ -0,0 +1,39 @@
+common:
+    target:
+        - mkl26z128xxx4
+    macros:
+        - INTERFACE_KL26Z
+        - CPU_MKL26Z128VLH4
+        - DAPLINK_HIF_ID=0x97969901  # DAPLINK_HIF_ID_KL26
+        - BL_TARGET_FLASH
+    includes:
+        - source/hif_hal/freescale/kl26z
+        - source/hif_hal/freescale/iap/devices/MKL26Z4
+        - source/hif_hal/freescale/kl26z
+        # fsl_flash_driver
+        - source/hif_hal/freescale/iap/driver
+        - source/hif_hal/freescale/iap/devices
+    sources:
+        hif_hif_hal:
+            - source/hif_hal/freescale/kl26z
+            - source/hif_hal/freescale/iap/driver/flash_densities_kl_series.c
+            - source/hif_hal/freescale/iap/devices/MKL26Z4
+            - source/hif_hal/freescale/kl26z
+            - source/hif_hal/freescale/kl26z/armcc
+        fsl_flash_driver:
+            - source/hif_hal/freescale/iap
+            - source/hif_hal/freescale/iap/driver/flash_init.c
+            - source/hif_hal/freescale/iap/driver/flash_erase.c
+            - source/hif_hal/freescale/iap/driver/flash_program.c
+            - source/hif_hal/freescale/iap/driver/flash_erase_all.c
+            - source/hif_hal/freescale/iap/driver/flash_verify_erase.c
+            - source/hif_hal/freescale/iap/driver/flash_get_property.c
+            - source/hif_hal/freescale/iap/driver/flash_verify_program.c
+            - source/hif_hal/freescale/iap/driver/flash_verify_erase_all.c
+            - source/hif_hal/freescale/iap/driver/flash_command_sequence.c
+
+tool_specific:
+    uvision:
+        misc:
+            ld_flags:
+                - --predefine="-I..\..\..\source\hif_hal\freescale\kl26z"

records/hif_hal/lpc11u35.yaml

@@ -0,0 +1,20 @@
+common:
+    target:
+        - lpc11u35_501
+    macros:
+        - INTERFACE_LPC11U35
+        - DAPLINK_HIF_ID=0x97969902  # DAPLINK_HIF_ID_LPC11U35
+    includes:
+        - source/hif_hal/nxp/lpc11u35
+        - source/hif_hal/nxp/lpc11u35
+    sources:
+        hif_hal:
+            - source/hif_hal/nxp/lpc11u35
+            - source/hif_hal/nxp/lpc11u35/armcc
+            - source/hif_hal/nxp/lpc11u35
+
+tool_specific:
+    uvision:
+        misc:
+            ld_flags:
+                - --predefine="-I..\..\..\source\hif_hal\nxp\lpc11u35"

records/hif_hal/sam3u2c.yaml

@@ -0,0 +1,21 @@
+common:
+    target:
+        - atsam3u2c
+    macros:
+        - INTERFACE_SAM3U2C
+        - __SAM3U2C__
+        - DAPLINK_HIF_ID=0x97969903  # DAPLINK_HIF_ID_SAM3U2C
+    includes:
+        - source/hif_hal/atmel/sam3u2c
+        - source/hif_hal/atmel/sam3u2c
+    sources:
+        hif_hal:
+            - source/hif_hal/atmel/sam3u2c
+            - source/hif_hal/atmel/sam3u2c/armcc
+            - source/hif_hal/atmel/sam3u2c
+
+tool_specific:
+    uvision:
+        misc:
+            ld_flags:
+                - --predefine="-I..\..\..\source\hif_hal\atmel\sam3u2c"

records/tools/uvision.uvproj.tmpl

@@ -345,7 +345,7 @@
           <Cads>
             <interw>1</interw>
             <Optim>3</Optim>
-            <oTime>1</oTime>
+            <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
             <Strict>0</Strict>

source/daplink/bootloader/daplink.c

@@ -23,7 +23,7 @@ COMPILER_ASSERT(DAPLINK_BUILD_KEY == DAPLINK_BUILD_KEY_BL);
 // daplink_mode_file_name, daplink_url_name and 
 // daplink_drive_name strings must be 11 characters 
 // excluding the null terminated character
-const char daplink_mode_file_name[11] = "START_IFCFG";
+const char daplink_mode_file_name[11] = "START_IFACT";
 const char daplink_url_name[11] =       "HELP_FAQHTM";
 const char daplink_drive_name[11] =     "MAINTENANCE";
 const char * const daplink_target_url = "https://mbed.com/daplink";