diff --git a/targets/atsamd21e18a.json b/targets/atsamd21e18a.json index 3b35a7b7..0fcf5067 100644 --- a/targets/atsamd21e18a.json +++ b/targets/atsamd21e18a.json @@ -1,10 +1,6 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv6m-none-eabi", + "inherits": ["cortex-m0plus"], "build-tags": ["atsamd21e18a", "atsamd21e18", "atsamd21", "sam"], - "cflags": [ - "--target=armv6m-none-eabi" - ], "linkerscript": "targets/atsamd21.ld", "extra-files": [ "src/device/sam/atsamd21e18a.s" diff --git a/targets/atsamd21g18a.json b/targets/atsamd21g18a.json index f9b8a540..956afba5 100644 --- a/targets/atsamd21g18a.json +++ b/targets/atsamd21g18a.json @@ -1,10 +1,6 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv6m-none-eabi", + "inherits": ["cortex-m0plus"], "build-tags": ["atsamd21g18a", "atsamd21g18", "atsamd21", "sam"], - "cflags": [ - "--target=armv6m-none-eabi" - ], "linkerscript": "targets/atsamd21.ld", "extra-files": [ "src/device/sam/atsamd21g18a.s" diff --git a/targets/bluepill.json b/targets/bluepill.json index 1bd029a3..9f1e4b00 100644 --- a/targets/bluepill.json +++ b/targets/bluepill.json @@ -1,10 +1,6 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv7m-none-eabi", + "inherits": ["cortex-m3"], "build-tags": ["bluepill", "stm32f103", "stm32f1", "stm32"], - "cflags": [ - "--target=armv7m-none-eabi" - ], "linkerscript": "targets/stm32.ld", "extra-files": [ "src/device/stm32/stm32f103.s" diff --git a/targets/cortex-m-qemu.json b/targets/cortex-m-qemu.json index 6d384c74..1d1cfc89 100644 --- a/targets/cortex-m-qemu.json +++ b/targets/cortex-m-qemu.json @@ -1,10 +1,6 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv7m-none-eabi", + "inherits": ["cortex-m3"], "build-tags": ["qemu", "lm3s6965"], - "cflags": [ - "--target=armv7m-none-eabi" - ], "linkerscript": "targets/lm3s6965.ld", "extra-files": [ "targets/cortex-m-qemu.s" diff --git a/targets/cortex-m0plus.json b/targets/cortex-m0plus.json new file mode 100644 index 00000000..f86945b8 --- /dev/null +++ b/targets/cortex-m0plus.json @@ -0,0 +1,7 @@ +{ + "inherits": ["cortex-m"], + "llvm-target": "armv6m-none-eabi", + "cflags": [ + "--target=armv6m-none-eabi" + ] +} diff --git a/targets/cortex-m3.json b/targets/cortex-m3.json new file mode 100644 index 00000000..68ecb7fc --- /dev/null +++ b/targets/cortex-m3.json @@ -0,0 +1,7 @@ +{ + "inherits": ["cortex-m"], + "llvm-target": "armv7m-none-eabi", + "cflags": [ + "--target=armv7m-none-eabi" + ] +} diff --git a/targets/cortex-m7.json b/targets/cortex-m7.json index dcaa4257..f63490eb 100644 --- a/targets/cortex-m7.json +++ b/targets/cortex-m7.json @@ -1,7 +1,10 @@ { "inherits": ["cortex-m"], "llvm-target": "armv7em-none-eabi", + "cpu": "cortex-m7", "cflags": [ - "--target=armv7em-none-eabi" + "--target=armv7em-none-eabi", + "-mcpu=cortex-m7", + "-mfloat-abi=soft" ] } diff --git a/targets/nrf51.json b/targets/nrf51.json index 2327d39f..714e2c55 100644 --- a/targets/nrf51.json +++ b/targets/nrf51.json @@ -1,9 +1,7 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv6m-none-eabi", + "inherits": ["cortex-m0"], "build-tags": ["nrf51822", "nrf51", "nrf"], "cflags": [ - "--target=armv6m-none-eabi", "-DNRF51", "-I{root}/lib/CMSIS/CMSIS/Include", "-I{root}/lib/nrfx/mdk" diff --git a/targets/nucleo-f103rb.json b/targets/nucleo-f103rb.json index 10c9b2a6..1c12af84 100644 --- a/targets/nucleo-f103rb.json +++ b/targets/nucleo-f103rb.json @@ -1,10 +1,6 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv7m-none-eabi", + "inherits": ["cortex-m3"], "build-tags": ["nucleof103rb", "stm32f103", "stm32f1","stm32"], - "cflags": [ - "--target=armv7m-none-eabi" - ], "linkerscript": "targets/stm32f103rb.ld", "extra-files": [ "src/device/stm32/stm32f103.s" diff --git a/targets/stm32l0x2.json b/targets/stm32l0x2.json index 78389f37..13b42cc5 100644 --- a/targets/stm32l0x2.json +++ b/targets/stm32l0x2.json @@ -1,16 +1,12 @@ { "inherits": [ - "cortex-m" + "cortex-m0plus" ], - "llvm-target": "armv6m-none-eabi", "build-tags": [ "stm32l0", "stm32l0x2", "stm32" ], - "cflags": [ - "--target=armv6m-none-eabi" - ], "extra-files": [ "src/device/stm32/stm32l0x2.s" ] diff --git a/targets/teensy36.json b/targets/teensy36.json index de9e6dc0..c341511e 100644 --- a/targets/teensy36.json +++ b/targets/teensy36.json @@ -1,13 +1,6 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv7em-none-eabi", - "cpu": "cortex-m4", + "inherits": ["cortex-m4"], "build-tags": ["teensy36", "teensy", "mk66f18", "nxp"], - "cflags": [ - "--target=armv7em-none-eabi", - "-mfloat-abi=hard", - "-mfpu=fpv4-sp-d16" - ], "linkerscript": "targets/nxpmk66f18.ld", "extra-files": [ "src/device/nxp/mk66f18.s", diff --git a/targets/teensy40.json b/targets/teensy40.json index 0ecb0353..d08b8d1d 100644 --- a/targets/teensy40.json +++ b/targets/teensy40.json @@ -1,14 +1,8 @@ { - "inherits": ["cortex-m"], - "llvm-target": "armv7em-none-eabi", - "cpu": "cortex-m7", + "inherits": ["cortex-m7"], "build-tags": ["teensy40", "teensy", "mimxrt1062", "nxp"], "automatic-stack-size": false, "default-stack-size": 4096, - "cflags": [ - "--target=armv7em-none-eabi", - "-mfloat-abi=soft" - ], "linkerscript": "targets/mimxrt1062-teensy40.ld", "extra-files": [ "src/device/nxp/mimxrt1062.s",