Skip to content

Commit b547856

Browse files
0xc01700xc0170
authored
Merge pull request #2114 from AlessandroA/update_uvisor
Update the uVisor importer script
2 parents e237d15 + 5b488f3 commit b547856

File tree

12 files changed

+420
-4
lines changed

12 files changed

+420
-4
lines changed

‎features/FEATURE_UVISOR/AUTHORS.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
512 Milosch Meriac
2-
434 Alessandro Angelino
1+
514 Milosch Meriac
2+
439 Alessandro Angelino
33
28 Niklas Hauser
44
22 Jaeden Amero
55
3 Hugo Vincent

‎features/FEATURE_UVISOR/README.md

Lines changed: 413 additions & 0 deletions
Large diffs are not rendered by default.

‎features/FEATURE_UVISOR/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.9.21-alpha
1+
v0.9.22-alpha

‎features/FEATURE_UVISOR/importer/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ TARGET_LIB_INC:=$(TARGET_PREFIX)includes/uvisor-lib
3333

3434
# uVisor source directory - hidden from mbed via TARGET_IGNORE
3535
UVISOR_GIT_URL:=https://github.com/ARMmbed/uvisor
36-
UVISOR_GIT_BRANCH:=unstable
36+
UVISOR_GIT_BRANCH:=dev
3737
UVISOR_DIR:=TARGET_IGNORE/uvisor
3838
UVISOR_API:=$(UVISOR_DIR)/api
3939
UVISOR_GIT_CFG=$(UVISOR_DIR)/.git/config
@@ -75,6 +75,9 @@ rsync:
7575
cp $(UVISOR_DIR)/core/system/inc/page_allocator_config.h $(TARGET_LIB_SRC)/page_allocator_config.h
7676
rsync -a --delete $(UVISOR_API)/rtx/src/ $(TARGET_LIB_SRC)/rtx
7777
#
78+
# Copying the documentation...
79+
cp $(UVISOR_DIR)/docs/QUICKSTART.md $(TARGET_PREFIX)/README.md
80+
#
7881
# Copying licenses
7982
cp $(UVISOR_DIR)/LICENSE* $(TARGET_SUPPORTED)
8083

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_DEBUG/TARGET_M3/libconfiguration_efm32_m3_p1.a

192 Bytes
Binary file not shown.

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_DEBUG/TARGET_M4/libconfiguration_efm32_m4_p1.a

192 Bytes
Binary file not shown.

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_RELEASE/TARGET_M3/libconfiguration_efm32_m3_p1.a

192 Bytes
Binary file not shown.

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_EFM32/TARGET_RELEASE/TARGET_M4/libconfiguration_efm32_m4_p1.a

192 Bytes
Binary file not shown.

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_MCU_K64F/TARGET_DEBUG/TARGET_M4/libconfiguration_kinetis_m4_0x1fff0000.a

192 Bytes
Binary file not shown.

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_MCU_K64F/TARGET_RELEASE/TARGET_M4/libconfiguration_kinetis_m4_0x1fff0000.a

192 Bytes
Binary file not shown.

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_STM32F4/TARGET_DEBUG/TARGET_M4/libconfiguration_stm32_m4_0x10000000_0x0.a

192 Bytes
Binary file not shown.

‎features/FEATURE_UVISOR/targets/TARGET_UVISOR_SUPPORTED/TARGET_STM32F4/TARGET_RELEASE/TARGET_M4/libconfiguration_stm32_m4_0x10000000_0x0.a

192 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)