ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6235 from gorazdko/lpc546xx-fixes 

mcu_lpc546xx: move "release_versions" to children and fix clock
pull/6282/merge
Cruz Monrreal 2018-03-06 20:41:56 -06:00 committed by GitHub
parent 8a7b390fdd c053b70a75
commit fb0eba4cd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/TARGET_LPCXpresso/mbed_overrides.c
View File

@ -41,7 +41,6 @@ void ADC_ClockPower_Configuration(void)
POWER_DisablePD(kPDRUNCFG_PD_TEMPS); /* Power on the temperature sensor. */ POWER_DisablePD(kPDRUNCFG_PD_TEMPS); /* Power on the temperature sensor. */
/* Enable the clock. */ /* Enable the clock. */
CLOCK_AttachClk(kFRO12M_to_MAIN_CLK);
CLOCK_EnableClock(kCLOCK_Adc0); CLOCK_EnableClock(kCLOCK_Adc0);
} }

2
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c
View File

@ -73,8 +73,6 @@ void ADC_ClockPower_Configuration(void)
POWER_DisablePD(kPDRUNCFG_PD_VREFP); /* Power on the reference voltage source. */ POWER_DisablePD(kPDRUNCFG_PD_VREFP); /* Power on the reference voltage source. */
POWER_DisablePD(kPDRUNCFG_PD_TS); /* Power on the temperature sensor. */ POWER_DisablePD(kPDRUNCFG_PD_TS); /* Power on the temperature sensor. */
/* Enable the clock. */
CLOCK_AttachClk(kFRO12M_to_MAIN_CLK);
/* CLOCK_AttachClk(kMAIN_CLK_to_ADC_CLK); */ /* CLOCK_AttachClk(kMAIN_CLK_to_ADC_CLK); */
/* Sync clock source is not used. Using sync clock source and would be divided by 2. /* Sync clock source is not used. Using sync clock source and would be divided by 2.

2
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c
View File

@ -121,8 +121,6 @@ void ADC_ClockPower_Configuration(void)
POWER_DisablePD(kPDRUNCFG_PD_VREFP); /* Power on the reference voltage source. */ POWER_DisablePD(kPDRUNCFG_PD_VREFP); /* Power on the reference voltage source. */
POWER_DisablePD(kPDRUNCFG_PD_TS); /* Power on the temperature sensor. */ POWER_DisablePD(kPDRUNCFG_PD_TS); /* Power on the temperature sensor. */
/* Enable the clock. */
CLOCK_AttachClk(kFRO12M_to_MAIN_CLK);
/* CLOCK_AttachClk(kMAIN_CLK_to_ADC_CLK); */ /* CLOCK_AttachClk(kMAIN_CLK_to_ADC_CLK); */
/* Sync clock source is not used. Using sync clock source and would be divided by 2. /* Sync clock source is not used. Using sync clock source and would be divided by 2.

7
targets/targets.json
View File

@ -755,18 +755,19 @@
"inherits": ["Target"], "inherits": ["Target"],
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
"features": ["LWIP"], "features": ["LWIP"],
"release_versions": ["2", "5"],
"device_name" : "LPC54628J512ET180" "device_name" : "LPC54628J512ET180"
}, },
"LPC546XX": { "LPC546XX": {
"supported_form_factors": ["ARDUINO"], "supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_LPC546XX"], "inherits": ["MCU_LPC546XX"],
"detect_code": ["1056"] "detect_code": ["1056"],
"release_versions": ["2", "5"]
}, },
"FF_LPC546XX": { "FF_LPC546XX": {
"inherits": ["MCU_LPC546XX"], "inherits": ["MCU_LPC546XX"],
"extra_labels_remove" : ["LPCXpresso"], "extra_labels_remove" : ["LPCXpresso"],
"detect_code": ["8081"] "detect_code": ["8081"],
"release_versions": ["2", "5"]
}, },
"NUCLEO_F030R8": { "NUCLEO_F030R8": {
"inherits": ["FAMILY_STM32"], "inherits": ["FAMILY_STM32"],