Skip to content

Commit 0503082

Browse files
ohagendorfohagendorf
committed
[Keil5] rebasing and removing yet unacessary parts
- rebasing - removing all uvision5 entries from targets.json - except for nucleo_f042 - it needs an own uvision5 template
1 parent 34c6345 commit 0503082

File tree

2 files changed

+8
-51
lines changed

2 files changed

+8
-51
lines changed

‎hal/targets.json‎

Lines changed: 8 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -667,12 +667,7 @@
667667
"extra_labels": ["STM", "STM32F3", "STM32F303K8"],
668668
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
669669
"inherits": ["Target"],
670-
"progen": {
671-
"target": "nucleo-f303k8",
672-
"uvision5": {
673-
"template": ["uvision_microlib.uvproj.tmpl"]
674-
}
675-
},
670+
"progen": {"target": "nucleo-f303k8"},
676671
"detect_code": ["0775"],
677672
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
678673
"default_build": "small"
@@ -684,12 +679,7 @@
684679
"extra_labels": ["STM", "STM32F3", "STM32F303RE"],
685680
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
686681
"inherits": ["Target"],
687-
"progen": {
688-
"target": "nucleo-f303re",
689-
"uvision5": {
690-
"template": ["uvision_microlib.uvproj.tmpl"]
691-
}
692-
},
682+
"progen": {"target": "nucleo-f303re"},
693683
"detect_code": ["0745"],
694684
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
695685
"default_build": "small"
@@ -713,12 +703,7 @@
713703
"extra_labels": ["STM", "STM32F4", "STM32F401RE"],
714704
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
715705
"inherits": ["Target"],
716-
"progen": {
717-
"target": "nucleo-f401re",
718-
"uvision5": {
719-
"template": ["uvision_microlib.uvproj.tmpl"]
720-
}
721-
},
706+
"progen": {"target": "nucleo-f401re"},
722707
"detect_code": ["0720"],
723708
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
724709
"default_build": "small"
@@ -730,12 +715,7 @@
730715
"extra_labels": ["STM", "STM32F4", "STM32F410RB"],
731716
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
732717
"inherits": ["Target"],
733-
"progen": {
734-
"target": "nucleo-f410rb",
735-
"uvision5": {
736-
"template": ["uvision_microlib.uvproj.tmpl"]
737-
}
738-
},
718+
"progen": {"target": "nucleo-f410rb"},
739719
"detect_code": ["0740"],
740720
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
741721
"default_build": "small"
@@ -747,12 +727,7 @@
747727
"extra_labels": ["STM", "STM32F4", "STM32F411RE"],
748728
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
749729
"inherits": ["Target"],
750-
"progen": {
751-
"target": "nucleo-f411re",
752-
"uvision5": {
753-
"template": ["uvision_microlib.uvproj.tmpl"]
754-
}
755-
},
730+
"progen": {"target": "nucleo-f411re"},
756731
"detect_code": ["0740"],
757732
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
758733
"default_build": "small"
@@ -775,12 +750,7 @@
775750
"extra_labels": ["STM", "STM32F4", "STM32F446RE"],
776751
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
777752
"inherits": ["Target"],
778-
"progen": {
779-
"target": "nucleo-f446re",
780-
"uvision5": {
781-
"template": ["uvision_microlib.uvproj.tmpl"]
782-
}
783-
},
753+
"progen": {"target": "nucleo-f446re"},
784754
"detect_code": ["0777"],
785755
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
786756
"default_build": "small"
@@ -806,9 +776,6 @@
806776
"target": "nucleo-f746zg",
807777
"iar": {
808778
"template": ["iar_nucleo_f746zg.ewp.tmpl"]
809-
},
810-
"uvision5": {
811-
"template": ["uvision_microlib.uvproj.tmpl"]
812779
}
813780
},
814781
"detect_code": ["0816"],
@@ -952,12 +919,7 @@
952919
"inherits": ["Target"],
953920
"core": "Cortex-M4F",
954921
"default_toolchain": "uARM",
955-
"progen": {
956-
"target": "disco-f407vg",
957-
"uvision5": {
958-
"template": ["uvision_microlib.uvproj.tmpl"]
959-
}
960-
},
922+
"progen": {"target": "disco-f407vg"},
961923
"extra_labels": ["STM", "STM32F4", "STM32F407", "STM32F407VG"],
962924
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
963925
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
@@ -1000,12 +962,7 @@
1000962
"default_toolchain": "uARM",
1001963
"extra_labels": ["STM", "STM32F7", "STM32F746", "STM32F746NG"],
1002964
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
1003-
"progen": {
1004-
"target": "disco-f746ng",
1005-
"uvision5": {
1006-
"template": ["uvision_microlib.uvproj.tmpl"]
1007-
}
1008-
},
965+
"progen": {"target": "disco-f746ng"},
1009966
"detect_code": ["0815"],
1010967
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
1011968
},

‎workspace_tools/export/uvision_microlib_crossmoduleoptim.uvproj.tmpl‎ renamed to ‎tools/export/uvision_microlib_crossmoduleoptim.uvproj.tmpl‎

File renamed without changes.

0 commit comments

Comments
 (0)