From 2f8b6dcaa962e340f6a8008320bbeb509df778c9 Mon Sep 17 00:00:00 2001 From: gorazd Date: Wed, 28 Feb 2018 13:16:01 +0100 Subject: [PATCH 1/2] mcu_lpc546xx: move "release_versions" to children --- targets/targets.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index 2e93c15b00..7068db9f51 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -755,18 +755,19 @@ "inherits": ["Target"], "device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "features": ["LWIP"], - "release_versions": ["2", "5"], "device_name" : "LPC54628J512ET180" }, "LPC546XX": { "supported_form_factors": ["ARDUINO"], "inherits": ["MCU_LPC546XX"], - "detect_code": ["1056"] + "detect_code": ["1056"], + "release_versions": ["2", "5"] }, "FF_LPC546XX": { "inherits": ["MCU_LPC546XX"], "extra_labels_remove" : ["LPCXpresso"], - "detect_code": ["8081"] + "detect_code": ["8081"], + "release_versions": ["2", "5"] }, "NUCLEO_F030R8": { "inherits": ["FAMILY_STM32"], From c053b70a7558efa6e8c5248cc6b7a99958321389 Mon Sep 17 00:00:00 2001 From: gorazd Date: Wed, 28 Feb 2018 13:23:38 +0100 Subject: [PATCH 2/2] lpc546xx and lpc54114: fix clock --- .../TARGET_LPC54114/TARGET_LPCXpresso/mbed_overrides.c | 1 - .../TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c | 2 -- .../TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c | 2 -- 3 files changed, 5 deletions(-) diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/TARGET_LPCXpresso/mbed_overrides.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/TARGET_LPCXpresso/mbed_overrides.c index 3d49a8cca5..037b2515bf 100644 --- a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/TARGET_LPCXpresso/mbed_overrides.c +++ b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/TARGET_LPCXpresso/mbed_overrides.c @@ -41,7 +41,6 @@ void ADC_ClockPower_Configuration(void) POWER_DisablePD(kPDRUNCFG_PD_TEMPS); /* Power on the temperature sensor. */ /* Enable the clock. */ - CLOCK_AttachClk(kFRO12M_to_MAIN_CLK); CLOCK_EnableClock(kCLOCK_Adc0); } diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c index a17af3a634..e5418bf47f 100644 --- a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c +++ b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c @@ -73,8 +73,6 @@ void ADC_ClockPower_Configuration(void) POWER_DisablePD(kPDRUNCFG_PD_VREFP); /* Power on the reference voltage source. */ 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); */ /* Sync clock source is not used. Using sync clock source and would be divided by 2. diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c index ccce4750c5..0d95d0345e 100644 --- a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c +++ b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c @@ -121,8 +121,6 @@ void ADC_ClockPower_Configuration(void) POWER_DisablePD(kPDRUNCFG_PD_VREFP); /* Power on the reference voltage source. */ 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); */ /* Sync clock source is not used. Using sync clock source and would be divided by 2.