Fix some bugs

Author: Jamie Smith

connectivity/drivers/emac/TARGET_Freescale_EMAC/kinetis_emac.cpp

@@ -409,7 +409,7 @@ bool Kinetis_EMAC::link_out(emac_mem_buf_t *buf)
     }
 
     /* Check if a descriptor is available for the transfer (wait 10ms before dropping the buffer) */
-    if (!xTXDCountSem.try_acquire_for(10)) {
+    if (!xTXDCountSem.try_acquire_for(10ms)) {
         memory_manager->free(buf);
         return false;
     }

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/device/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld

@@ -82,11 +82,11 @@ FLASH_CONFIG_FIELD_SIZE = 0x10;
 /* Specify the ELF segments (program headers) */
 PHDRS
 {
-    text PT_LOAD FLAGS(5); /* read + execute */
-    ram_vector_table PT_LOAD FLAGS(6); /* read + write */
-	ram_noinit PT_LOAD FLAGS(6); /* read + write */
-	ram_init PT_LOAD FLAGS(6); /* read + write */
-	sram_l PT_LOAD FLAGS(6); /* read + write */
+  text PT_LOAD FLAGS(5); /* read + execute */
+  ram_vector_table PT_LOAD FLAGS(6); /* read + write */
+  ram_noinit PT_LOAD FLAGS(6); /* read + write */
+  ram_init PT_LOAD FLAGS(6); /* read + write */
+  sram_l PT_LOAD FLAGS(6); /* read + write */
 }
 
 /* Specify the memory areas */
@@ -116,7 +116,7 @@ SECTIONS
 
   /* FCF to absolute address of 0x400, but only if bootloader is not present. */
 #if !IS_BOOTLOADER_PRESENT
-  .flash_config VTOR_TABLE_SIZE :
+  .flash_config FLASH_VTOR_TABLE_SIZE :
   {
     KEEP(*(.FlashConfig))    /* Flash Configuration Field (FCF) */
   } > m_text AT> m_text :text

tools/cmake/UploadMethodManager.cmake

@@ -77,7 +77,7 @@ foreach(LEGACY_VAR_NAME JLINK_USB_SERIAL_NUMBER LINKSERVER_PROBE_SN MBED_TARGET_
 		if(NOT "${${LEGACY_VAR_NAME}}" STREQUAL "")
 			message(WARNING "${LEGACY_VAR_NAME} is deprecated, set the MBED_UPLOAD_SERIAL_NUMBER variable instead. MBED_UPLOAD_SERIAL_NUMBER will be set to the value of ${LEGACY_VAR_NAME}.")
 			set(MBED_UPLOAD_SERIAL_NUMBER ${${LEGACY_VAR_NAME}} CACHE STRING "" FORCE)
-			unset(STLINK_PROBE_SN CACHE)
+			unset(${LEGACY_VAR_NAME} CACHE)
 		endif()
 	endif()
 endforeach()