rebase failure

pull/1909/head
ohagendorf 2016-06-12 18:56:35 +02:00 committed by Olaf Hagendorf
parent 8292dd2fd2
commit 40506d899b
1 changed files with 0 additions and 7 deletions

View File

@ -805,13 +805,6 @@
"detect_code": ["0799"], "detect_code": ["0799"],
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"] "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
}, },
"NUCLEO_F767ZI": {
"inherits": ["Target"],
"core": "Cortex-M7F",
"extra_labels": ["STM", "STM32F7", "STM32F767", "STM32F767ZI"],
"supported_toolchains": ["GCC_ARM"],
"progen": { "target": "nucleo-f769zi"}
},
"NUCLEO_L031K6": { "NUCLEO_L031K6": {
"inherits": ["Target"], "inherits": ["Target"],
"core": "Cortex-M0", "core": "Cortex-M0",