ARMmbed · sg- · Aug 25, 2016 · Aug 24, 2016 · Aug 24, 2016
diff --git a/features/FEATURE_UVISOR/AUTHORS.txt b/features/FEATURE_UVISOR/AUTHORS.txt
@@ -1,12 +1,12 @@
-   514	Milosch Meriac
-   439	Alessandro Angelino
-    28	Niklas Hauser
-    22	Jaeden Amero
+   552	Milosch Meriac
+   457	Alessandro Angelino
+    40	Jaeden Amero
+    31	Niklas Hauser
      3	Hugo Vincent
      3	JaredCJR
      3	Jim Huang
      2	tonyyanxuan
-     1	Nathan Chong
+     1	Aksel Skauge Mellbye
      1	Irit Arkin
+     1	Nathan Chong
      1	ccli8
-     1	Aksel Skauge Mellbye
diff --git a/features/FEATURE_UVISOR/README.md b/features/FEATURE_UVISOR/README.md
@@ -138,10 +138,16 @@ Before compiling, we need to override the original `K64F` target to enable the u
             "target.features_add": ["UVISOR"],
             "target.extra_labels_add": ["UVISOR_SUPPORTED"]
         }
-    }
+    },
+    "macros": [
+      "FEATURE_UVISOR",
+      "TARGET_UVISOR_SUPPORTED"
+    ]
 }
 ```
 
+The macros `FEATURE_UVISOR` and `TARGET_UVISOR_SUPPORTED` in the configuration file above are automatically defined for C and C++ files, but not for assembly files. Since the uVisor relies on those symbols in some assembly code, we need to define them manually.
+
 ---
 
 **Checkpoint**

diff --git a/features/FEATURE_UVISOR/VERSION.txt b/features/FEATURE_UVISOR/VERSION.txt
@@ -1 +1 @@
-v0.9.22-alpha
+v0.20.1-alpha
diff --git a/...ARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_DEBUG/TARGET_M3/libconfiguration_efm32_m3_p1.a b/...ARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_DEBUG/TARGET_M3/libconfiguration_efm32_m3_p1.a
diff --git a/...ARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_DEBUG/TARGET_M4/libconfiguration_efm32_m4_p1.a b/...ARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_DEBUG/TARGET_M4/libconfiguration_efm32_m4_p1.a
diff --git a/...GET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_RELEASE/TARGET_M3/libconfiguration_efm32_m3_p1.a b/...GET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_RELEASE/TARGET_M3/libconfiguration_efm32_m3_p1.a
diff --git a/...GET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_RELEASE/TARGET_M4/libconfiguration_efm32_m4_p1.a b/...GET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_RELEASE/TARGET_M4/libconfiguration_efm32_m4_p1.a
diff --git a/...SUPPORTED/TARGET_MCU_K64F/TARGET_DEBUG/TARGET_M4/libconfiguration_kinetis_m4_0x1fff0000.a b/...SUPPORTED/TARGET_MCU_K64F/TARGET_DEBUG/TARGET_M4/libconfiguration_kinetis_m4_0x1fff0000.a
diff --git a/...PPORTED/TARGET_MCU_K64F/TARGET_RELEASE/TARGET_M4/libconfiguration_kinetis_m4_0x1fff0000.a b/...PPORTED/TARGET_MCU_K64F/TARGET_RELEASE/TARGET_M4/libconfiguration_kinetis_m4_0x1fff0000.a
diff --git a/...UPPORTED/TARGET_STM32F4/TARGET_DEBUG/TARGET_M4/libconfiguration_stm32_m4_0x10000000_0x0.a b/...UPPORTED/TARGET_STM32F4/TARGET_DEBUG/TARGET_M4/libconfiguration_stm32_m4_0x10000000_0x0.a
diff --git a/...PORTED/TARGET_STM32F4/TARGET_RELEASE/TARGET_M4/libconfiguration_stm32_m4_0x10000000_0x0.a b/...PORTED/TARGET_STM32F4/TARGET_RELEASE/TARGET_M4/libconfiguration_stm32_m4_0x10000000_0x0.a