Merge pull request #3831 from pradeep-gr/feature-spi-slave

NCS36510: SPISLAVE enabled (Conflict resolved)
ARMmbed · Mar 6, 2017 · c975c2b · c975c2b
2 parents 8fb95a6 + 4678a31
commit c975c2b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/targets/targets.json b/targets/targets.json
@@ -2600,7 +2600,7 @@
  "post_binary_hook": {"function": "NCS36510TargetCode.ncs36510_addfib"},
  "macros": ["CM3", "CPU_NCS36510", "TARGET_NCS36510", "LOAD_ADDRESS=0x3000"],
  "supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
- "device_has": ["ANALOGIN", "SERIAL", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "LOWPOWERTIMER", "TRNG"],
+ "device_has": ["ANALOGIN", "SERIAL", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "LOWPOWERTIMER", "TRNG", "SPISLAVE"],
  "release_versions": ["2", "5"]
  },
  "NUMAKER_PFM_M453": {