Updated init calls and Config Tool version.
This commit is contained in:
parent
05db61ad9f
commit
f8f4eab803
|
@ -85,12 +85,12 @@ set(TARGET_C_INCLUDES
|
||||||
|
|
||||||
# Shared libraries linked with application
|
# Shared libraries linked with application
|
||||||
set(TARGET_LIBS
|
set(TARGET_LIBS
|
||||||
|
"fro_calib_hardabi"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Shared library and linker script search paths
|
# Shared library and linker script search paths
|
||||||
set(TARGET_LIB_DIRECTORIES
|
set(TARGET_LIB_DIRECTORIES
|
||||||
|
"SDK/devices/LPC55S16/gcc"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Device specific settings, goes to CFLAGS and LDFLAGS
|
# Device specific settings, goes to CFLAGS and LDFLAGS
|
||||||
|
@ -127,6 +127,10 @@ link_libraries(${TARGET_LIBS})
|
||||||
add_executable("${CMAKE_PROJECT_NAME}_FLASH.elf" ${TARGET_SOURCES})
|
add_executable("${CMAKE_PROJECT_NAME}_FLASH.elf" ${TARGET_SOURCES})
|
||||||
target_link_options("${CMAKE_PROJECT_NAME}_FLASH.elf"
|
target_link_options("${CMAKE_PROJECT_NAME}_FLASH.elf"
|
||||||
PRIVATE "-T${TARGET_LDSCRIPT_FLASH}"
|
PRIVATE "-T${TARGET_LDSCRIPT_FLASH}"
|
||||||
|
PRIVATE "-Wl,--Map=${CMAKE_PROJECT_NAME}_FLASH.map"
|
||||||
|
)
|
||||||
|
set_property(TARGET "${CMAKE_PROJECT_NAME}_FLASH.elf" APPEND
|
||||||
|
PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_PROJECT_NAME}_FLASH.map"
|
||||||
)
|
)
|
||||||
add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_FLASH.hex"
|
add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_FLASH.hex"
|
||||||
COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_FLASH.elf" "${CMAKE_PROJECT_NAME}_FLASH.hex"
|
COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_FLASH.elf" "${CMAKE_PROJECT_NAME}_FLASH.hex"
|
||||||
|
@ -138,6 +142,10 @@ add_custom_target("${CMAKE_PROJECT_NAME}_FLASH_HEX" DEPENDS "${CMAKE_PROJECT_NAM
|
||||||
add_executable("${CMAKE_PROJECT_NAME}_RAM.elf" ${TARGET_SOURCES})
|
add_executable("${CMAKE_PROJECT_NAME}_RAM.elf" ${TARGET_SOURCES})
|
||||||
target_link_options("${CMAKE_PROJECT_NAME}_RAM.elf"
|
target_link_options("${CMAKE_PROJECT_NAME}_RAM.elf"
|
||||||
PRIVATE "-T${TARGET_LDSCRIPT_RAM}"
|
PRIVATE "-T${TARGET_LDSCRIPT_RAM}"
|
||||||
|
PRIVATE "-Wl,--Map=${CMAKE_PROJECT_NAME}_RAM.map"
|
||||||
|
)
|
||||||
|
set_property(TARGET "${CMAKE_PROJECT_NAME}_RAM.elf" APPEND
|
||||||
|
PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_PROJECT_NAME}_RAM.map"
|
||||||
)
|
)
|
||||||
add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_RAM.hex"
|
add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_RAM.hex"
|
||||||
COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_RAM.elf" "${CMAKE_PROJECT_NAME}_RAM.hex"
|
COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_RAM.elf" "${CMAKE_PROJECT_NAME}_RAM.hex"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding= "UTF-8" ?>
|
<?xml version="1.0" encoding= "UTF-8" ?>
|
||||||
<configuration name="LPCXpresso55S16" xsi:schemaLocation="http://mcuxpresso.nxp.com/XSD/mex_configuration_11 http://mcuxpresso.nxp.com/XSD/mex_configuration_11.xsd" uuid="f627c07d-840a-44da-80ce-53318dbb51bf" version="11" xmlns="http://mcuxpresso.nxp.com/XSD/mex_configuration_11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
<configuration name="LPCXpresso55S16" xsi:schemaLocation="http://mcuxpresso.nxp.com/XSD/mex_configuration_12 http://mcuxpresso.nxp.com/XSD/mex_configuration_12.xsd" uuid="f627c07d-840a-44da-80ce-53318dbb51bf" version="12" xmlns="http://mcuxpresso.nxp.com/XSD/mex_configuration_12" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<common>
|
<common>
|
||||||
<processor>LPC55S16</processor>
|
<processor>LPC55S16</processor>
|
||||||
<package>LPC55S16JBD100</package>
|
<package>LPC55S16JBD100</package>
|
||||||
|
@ -19,13 +19,13 @@
|
||||||
<generate_registers_defines>false</generate_registers_defines>
|
<generate_registers_defines>false</generate_registers_defines>
|
||||||
</preferences>
|
</preferences>
|
||||||
<tools>
|
<tools>
|
||||||
<pins name="Pins" version="11.0" enabled="true" update_project_code="true">
|
<pins name="Pins" version="12.0" enabled="true" update_project_code="true">
|
||||||
<generated_project_files>
|
<generated_project_files>
|
||||||
<file path="board/pin_mux.c" update_enabled="true"/>
|
<file path="board/pin_mux.c" update_enabled="true"/>
|
||||||
<file path="board/pin_mux.h" update_enabled="true"/>
|
<file path="board/pin_mux.h" update_enabled="true"/>
|
||||||
</generated_project_files>
|
</generated_project_files>
|
||||||
<pins_profile>
|
<pins_profile>
|
||||||
<processor_version>11.0.2</processor_version>
|
<processor_version>12.0.0</processor_version>
|
||||||
</pins_profile>
|
</pins_profile>
|
||||||
<functions_list>
|
<functions_list>
|
||||||
<function name="BOARD_InitDEBUG_UARTPins">
|
<function name="BOARD_InitDEBUG_UARTPins">
|
||||||
|
@ -504,13 +504,13 @@
|
||||||
</function>
|
</function>
|
||||||
</functions_list>
|
</functions_list>
|
||||||
</pins>
|
</pins>
|
||||||
<clocks name="Clocks" version="9.0" enabled="true" update_project_code="true">
|
<clocks name="Clocks" version="10.0" enabled="true" update_project_code="true">
|
||||||
<generated_project_files>
|
<generated_project_files>
|
||||||
<file path="board/clock_config.c" update_enabled="true"/>
|
<file path="board/clock_config.c" update_enabled="true"/>
|
||||||
<file path="board/clock_config.h" update_enabled="true"/>
|
<file path="board/clock_config.h" update_enabled="true"/>
|
||||||
</generated_project_files>
|
</generated_project_files>
|
||||||
<clocks_profile>
|
<clocks_profile>
|
||||||
<processor_version>11.0.2</processor_version>
|
<processor_version>12.0.0</processor_version>
|
||||||
</clocks_profile>
|
</clocks_profile>
|
||||||
<clock_configurations>
|
<clock_configurations>
|
||||||
<clock_configuration name="BOARD_BootClockFRO12M" id_prefix="" prefix_user_defined="false">
|
<clock_configuration name="BOARD_BootClockFRO12M" id_prefix="" prefix_user_defined="false">
|
||||||
|
@ -522,6 +522,11 @@
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
</feature>
|
</feature>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.power" description="Clocks initialization requires the POWER Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockFRO12M">
|
||||||
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
|
<data>true</data>
|
||||||
|
</feature>
|
||||||
|
</dependency>
|
||||||
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockFRO12M">
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockFRO12M">
|
||||||
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
|
@ -545,6 +550,11 @@
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
</feature>
|
</feature>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.power" description="Clocks initialization requires the POWER Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockFROHF96M">
|
||||||
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
|
<data>true</data>
|
||||||
|
</feature>
|
||||||
|
</dependency>
|
||||||
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockFROHF96M">
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockFROHF96M">
|
||||||
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
|
@ -562,7 +572,7 @@
|
||||||
<setting id="ANALOG_CONTROL_FRO192M_CTRL_ENDI_FRO_96M_CFG" value="Enable" locked="false"/>
|
<setting id="ANALOG_CONTROL_FRO192M_CTRL_ENDI_FRO_96M_CFG" value="Enable" locked="false"/>
|
||||||
<setting id="SYSCON.MAINCLKSELA.sel" value="ANACTRL.fro_hf_clk" locked="false"/>
|
<setting id="SYSCON.MAINCLKSELA.sel" value="ANACTRL.fro_hf_clk" locked="false"/>
|
||||||
</clock_settings>
|
</clock_settings>
|
||||||
<called_from_default_init>false</called_from_default_init>
|
<called_from_default_init>true</called_from_default_init>
|
||||||
</clock_configuration>
|
</clock_configuration>
|
||||||
<clock_configuration name="BOARD_BootClockPLL100M" id_prefix="" prefix_user_defined="false">
|
<clock_configuration name="BOARD_BootClockPLL100M" id_prefix="" prefix_user_defined="false">
|
||||||
<description></description>
|
<description></description>
|
||||||
|
@ -593,6 +603,11 @@
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
</feature>
|
</feature>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.power" description="Clocks initialization requires the POWER Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL100M">
|
||||||
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
|
<data>true</data>
|
||||||
|
</feature>
|
||||||
|
</dependency>
|
||||||
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL100M">
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL100M">
|
||||||
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
|
@ -646,6 +661,11 @@
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
</feature>
|
</feature>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.power" description="Clocks initialization requires the POWER Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL150M">
|
||||||
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
|
<data>true</data>
|
||||||
|
</feature>
|
||||||
|
</dependency>
|
||||||
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL150M">
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL150M">
|
||||||
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
|
@ -669,7 +689,7 @@
|
||||||
<setting id="SYSCON.PLL0N_DIV.scale" value="8" locked="true"/>
|
<setting id="SYSCON.PLL0N_DIV.scale" value="8" locked="true"/>
|
||||||
<setting id="SYSCON.PLL0_PDEC.scale" value="2" locked="true"/>
|
<setting id="SYSCON.PLL0_PDEC.scale" value="2" locked="true"/>
|
||||||
</clock_settings>
|
</clock_settings>
|
||||||
<called_from_default_init>true</called_from_default_init>
|
<called_from_default_init>false</called_from_default_init>
|
||||||
</clock_configuration>
|
</clock_configuration>
|
||||||
<clock_configuration name="BOARD_BootClockPLL1_150M" id_prefix="" prefix_user_defined="false">
|
<clock_configuration name="BOARD_BootClockPLL1_150M" id_prefix="" prefix_user_defined="false">
|
||||||
<description></description>
|
<description></description>
|
||||||
|
@ -700,6 +720,11 @@
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
</feature>
|
</feature>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.power" description="Clocks initialization requires the POWER Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL1_150M">
|
||||||
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
|
<data>true</data>
|
||||||
|
</feature>
|
||||||
|
</dependency>
|
||||||
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL1_150M">
|
<dependency resourceType="SWComponent" resourceId="platform.drivers.clock" description="Clocks initialization requires the CLOCK Driver in the project." problem_level="2" source="Clocks:BOARD_BootClockPLL1_150M">
|
||||||
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
<feature name="enabled" evaluation="equal" configuration="cm33_core0">
|
||||||
<data>true</data>
|
<data>true</data>
|
||||||
|
@ -740,7 +765,7 @@
|
||||||
<file path="board/peripherals.h" update_enabled="true"/>
|
<file path="board/peripherals.h" update_enabled="true"/>
|
||||||
</generated_project_files>
|
</generated_project_files>
|
||||||
<peripherals_profile>
|
<peripherals_profile>
|
||||||
<processor_version>11.0.2</processor_version>
|
<processor_version>12.0.0</processor_version>
|
||||||
</peripherals_profile>
|
</peripherals_profile>
|
||||||
<functional_groups>
|
<functional_groups>
|
||||||
<functional_group name="BOARD_InitPeripherals" uuid="e48301ba-6eae-42f0-b2e4-0109e547ef26" called_from_default_init="true" id_prefix="" core="cm33_core0">
|
<functional_group name="BOARD_InitPeripherals" uuid="e48301ba-6eae-42f0-b2e4-0109e547ef26" called_from_default_init="true" id_prefix="" core="cm33_core0">
|
||||||
|
|
|
@ -17,11 +17,11 @@
|
||||||
/* clang-format off */
|
/* clang-format off */
|
||||||
/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
||||||
!!GlobalInfo
|
!!GlobalInfo
|
||||||
product: Clocks v9.0
|
product: Clocks v10.0
|
||||||
processor: LPC55S16
|
processor: LPC55S16
|
||||||
package_id: LPC55S16JBD100
|
package_id: LPC55S16JBD100
|
||||||
mcu_data: ksdk2_0
|
mcu_data: ksdk2_0
|
||||||
processor_version: 11.0.2
|
processor_version: 12.0.0
|
||||||
board: LPCXpresso55S16
|
board: LPCXpresso55S16
|
||||||
* BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
|
* BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
|
||||||
/* clang-format on */
|
/* clang-format on */
|
||||||
|
@ -37,15 +37,13 @@ board: LPCXpresso55S16
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Variables
|
* Variables
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
/* System clock frequency. */
|
|
||||||
extern uint32_t SystemCoreClock;
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
************************ BOARD_InitBootClocks function ************************
|
************************ BOARD_InitBootClocks function ************************
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
void BOARD_InitBootClocks(void)
|
void BOARD_InitBootClocks(void)
|
||||||
{
|
{
|
||||||
BOARD_BootClockPLL150M();
|
BOARD_BootClockFROHF96M();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
@ -97,6 +95,7 @@ void BOARD_BootClockFRO12M(void)
|
||||||
/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
||||||
!!Configuration
|
!!Configuration
|
||||||
name: BOARD_BootClockFROHF96M
|
name: BOARD_BootClockFROHF96M
|
||||||
|
called_from_default_init: true
|
||||||
outputs:
|
outputs:
|
||||||
- {id: FRO_12MHz_clock.outFreq, value: 12 MHz}
|
- {id: FRO_12MHz_clock.outFreq, value: 12 MHz}
|
||||||
- {id: System_clock.outFreq, value: 96 MHz}
|
- {id: System_clock.outFreq, value: 96 MHz}
|
||||||
|
@ -219,7 +218,6 @@ void BOARD_BootClockPLL100M(void)
|
||||||
/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
||||||
!!Configuration
|
!!Configuration
|
||||||
name: BOARD_BootClockPLL150M
|
name: BOARD_BootClockPLL150M
|
||||||
called_from_default_init: true
|
|
||||||
outputs:
|
outputs:
|
||||||
- {id: FRO_12MHz_clock.outFreq, value: 12 MHz}
|
- {id: FRO_12MHz_clock.outFreq, value: 12 MHz}
|
||||||
- {id: System_clock.outFreq, value: 150 MHz}
|
- {id: System_clock.outFreq, value: 150 MHz}
|
||||||
|
|
|
@ -10,7 +10,7 @@ product: Peripherals v11.0
|
||||||
processor: LPC55S16
|
processor: LPC55S16
|
||||||
package_id: LPC55S16JBD100
|
package_id: LPC55S16JBD100
|
||||||
mcu_data: ksdk2_0
|
mcu_data: ksdk2_0
|
||||||
processor_version: 11.0.2
|
processor_version: 12.0.0
|
||||||
board: LPCXpresso55S16
|
board: LPCXpresso55S16
|
||||||
functionalGroups:
|
functionalGroups:
|
||||||
- name: BOARD_InitPeripherals
|
- name: BOARD_InitPeripherals
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
/*
|
/*
|
||||||
* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
|
||||||
!!GlobalInfo
|
!!GlobalInfo
|
||||||
product: Pins v11.0
|
product: Pins v12.0
|
||||||
processor: LPC55S16
|
processor: LPC55S16
|
||||||
package_id: LPC55S16JBD100
|
package_id: LPC55S16JBD100
|
||||||
mcu_data: ksdk2_0
|
mcu_data: ksdk2_0
|
||||||
processor_version: 11.0.2
|
processor_version: 12.0.0
|
||||||
board: LPCXpresso55S16
|
board: LPCXpresso55S16
|
||||||
* BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS ***********
|
* BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS ***********
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
BOARD_InitBootPins();
|
BOARD_InitBootPins();
|
||||||
BOARD_BootClockFROHF96M();
|
BOARD_InitBootClocks();
|
||||||
BOARD_InitBootPeripherals();
|
BOARD_InitBootPeripherals();
|
||||||
|
|
||||||
BOARD_InitDebugConsole();
|
BOARD_InitDebugConsole();
|
||||||
|
|
Loading…
Reference in New Issue