From 492243f80103b48182a57ce539b26740c4241b87 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Sun, 6 May 2018 15:19:38 +0200 Subject: [PATCH 1/7] Added _pvHeapStart entry This is needed for Semihosting --- right/src/link/MK22FN512xxx12_flash.ld | 1 + 1 file changed, 1 insertion(+) diff --git a/right/src/link/MK22FN512xxx12_flash.ld b/right/src/link/MK22FN512xxx12_flash.ld index dd1e065..7c724c9 100644 --- a/right/src/link/MK22FN512xxx12_flash.ld +++ b/right/src/link/MK22FN512xxx12_flash.ld @@ -236,6 +236,7 @@ SECTIONS . = ALIGN(8); __end__ = .; PROVIDE(end = .); + _pvHeapStart = .; /* Add for _sbrk */ __HeapBase = .; . += HEAP_SIZE; __HeapLimit = .; From c3407e1410e1d8e00f721ef15b2345579735caaa Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Sun, 6 May 2018 15:22:24 +0200 Subject: [PATCH 2/7] Added Makefiles as linked resources, so they show up in the IDE --- left/build/.project | 10 ++++++++++ right/build/.project | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/left/build/.project b/left/build/.project index 2449508..bbecb43 100644 --- a/left/build/.project +++ b/left/build/.project @@ -31,6 +31,16 @@ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + Makedefs.mk + 1 + PARENT-2-PROJECT_LOC/scripts/Makedefs.mk + + + Makefile + 1 + PARENT-1-PROJECT_LOC/Makefile + drivers 2 diff --git a/right/build/.project b/right/build/.project index b54366a..0e8d94f 100644 --- a/right/build/.project +++ b/right/build/.project @@ -30,6 +30,16 @@ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + Makedefs.mk + 1 + PARENT-2-PROJECT_LOC/scripts/Makedefs.mk + + + Makefile + 1 + PARENT-1-PROJECT_LOC/Makefile + bootloader-shared 2 From 58fa1ed6a47847bf34c6b12cee7df350ab0ecf84 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Sun, 6 May 2018 15:38:07 +0200 Subject: [PATCH 3/7] Use the bundled Makefiles instead of having the IDE generate them automatically --- left/build/.cproject | 12 ++++++------ right/build/.cproject | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/left/build/.cproject b/left/build/.cproject index 7f7de42..541e3ae 100644 --- a/left/build/.cproject +++ b/left/build/.cproject @@ -5,16 +5,16 @@ + - - + - - <?xml version="1.0" encoding="UTF-8"?> -<TargetConfig> -<Properties property_3="NXP" property_4="MK22FN512xxx12" property_count="5" version="70200"/> -<infoList vendor="NXP"><info chip="MK22FN512xxx12" name="MK22FN512xxx12"><chip><name>MK22FN512xxx12</name> -<family>K2x</family> -<vendor>NXP</vendor> -<memory can_program="true" id="Flash" is_ro="true" size="512" type="Flash"/> -<memory id="RAM" size="128" type="RAM"/> -<memoryInstance derived_from="Flash" driver="FTFA_2K.cfx" id="PROGRAM_FLASH" location="0x0" size="0x80000"/> -<memoryInstance derived_from="RAM" id="SRAM_UPPER" location="0x20000000" size="0x10000"/> -<memoryInstance derived_from="RAM" id="SRAM_LOWER" location="0x1fff0000" size="0x10000"/> -<peripheralInstance derived_from="FTFA_FlashConfig" id="FTFA_FlashConfig" location="0x400"/> -<peripheralInstance derived_from="DMA" id="DMA" location="0x40008000"/> -<peripheralInstance derived_from="FB" id="FB" location="0x4000C000"/> -<peripheralInstance derived_from="FMC" id="FMC" location="0x4001F000"/> -<peripheralInstance derived_from="FTFA" id="FTFA" location="0x40020000"/> -<peripheralInstance derived_from="DMAMUX" id="DMAMUX" location="0x40021000"/> -<peripheralInstance derived_from="FTM0" id="FTM0" location="0x40038000"/> -<peripheralInstance derived_from="FTM1" id="FTM1" location="0x40039000"/> -<peripheralInstance derived_from="FTM2" id="FTM2" location="0x4003A000"/> -<peripheralInstance derived_from="FTM3" id="FTM3" location="0x40026000"/> -<peripheralInstance derived_from="ADC0" id="ADC0" location="0x4003B000"/> -<peripheralInstance derived_from="ADC1" id="ADC1" location="0x40027000"/> -<peripheralInstance derived_from="DAC0" id="DAC0" location="0x4003F000"/> -<peripheralInstance derived_from="DAC1" id="DAC1" location="0x40028000"/> -<peripheralInstance derived_from="RNG" id="RNG" location="0x40029000"/> -<peripheralInstance derived_from="LPUART0" id="LPUART0" location="0x4002A000"/> -<peripheralInstance derived_from="SPI0" id="SPI0" location="0x4002C000"/> -<peripheralInstance derived_from="SPI1" id="SPI1" location="0x4002D000"/> -<peripheralInstance derived_from="I2S0" id="I2S0" location="0x4002F000"/> -<peripheralInstance derived_from="CRC" id="CRC" location="0x40032000"/> -<peripheralInstance derived_from="PDB0" id="PDB0" location="0x40036000"/> -<peripheralInstance derived_from="PIT" id="PIT" location="0x40037000"/> -<peripheralInstance derived_from="RTC" id="RTC" location="0x4003D000"/> -<peripheralInstance derived_from="RFVBAT" id="RFVBAT" location="0x4003E000"/> -<peripheralInstance derived_from="LPTMR0" id="LPTMR0" location="0x40040000"/> -<peripheralInstance derived_from="RFSYS" id="RFSYS" location="0x40041000"/> -<peripheralInstance derived_from="SIM" id="SIM" location="0x40047000"/> -<peripheralInstance derived_from="PORTA" id="PORTA" location="0x40049000"/> -<peripheralInstance derived_from="PORTB" id="PORTB" location="0x4004A000"/> -<peripheralInstance derived_from="PORTC" id="PORTC" location="0x4004B000"/> -<peripheralInstance derived_from="PORTD" id="PORTD" location="0x4004C000"/> -<peripheralInstance derived_from="PORTE" id="PORTE" location="0x4004D000"/> -<peripheralInstance derived_from="WDOG" id="WDOG" location="0x40052000"/> -<peripheralInstance derived_from="EWM" id="EWM" location="0x40061000"/> -<peripheralInstance derived_from="MCG" id="MCG" location="0x40064000"/> -<peripheralInstance derived_from="OSC" id="OSC" location="0x40065000"/> -<peripheralInstance derived_from="I2C0" id="I2C0" location="0x40066000"/> -<peripheralInstance derived_from="I2C1" id="I2C1" location="0x40067000"/> -<peripheralInstance derived_from="UART0" id="UART0" location="0x4006A000"/> -<peripheralInstance derived_from="UART1" id="UART1" location="0x4006B000"/> -<peripheralInstance derived_from="UART2" id="UART2" location="0x4006C000"/> -<peripheralInstance derived_from="USB0" id="USB0" location="0x40072000"/> -<peripheralInstance derived_from="CMP0" id="CMP0" location="0x40073000"/> -<peripheralInstance derived_from="CMP1" id="CMP1" location="0x40073008"/> -<peripheralInstance derived_from="VREF" id="VREF" location="0x40074000"/> -<peripheralInstance derived_from="LLWU" id="LLWU" location="0x4007C000"/> -<peripheralInstance derived_from="PMC" id="PMC" location="0x4007D000"/> -<peripheralInstance derived_from="SMC" id="SMC" location="0x4007E000"/> -<peripheralInstance derived_from="RCM" id="RCM" location="0x4007F000"/> -<peripheralInstance derived_from="GPIOA" id="GPIOA" location="0x400FF000"/> -<peripheralInstance derived_from="GPIOB" id="GPIOB" location="0x400FF040"/> -<peripheralInstance derived_from="GPIOC" id="GPIOC" location="0x400FF080"/> -<peripheralInstance derived_from="GPIOD" id="GPIOD" location="0x400FF0C0"/> -<peripheralInstance derived_from="GPIOE" id="GPIOE" location="0x400FF100"/> -<peripheralInstance derived_from="SystemControl" id="SystemControl" location="0xE000E000"/> -<peripheralInstance derived_from="SysTick" id="SysTick" location="0xE000E010"/> -<peripheralInstance derived_from="NVIC" id="NVIC" location="0xE000E100"/> -<peripheralInstance derived_from="MCM" id="MCM" location="0xE0080000"/> -</chip> -<processor><name gcc_name="cortex-m4">Cortex-M4</name> -<family>Cortex-M</family> -</processor> -<link href="MK22F51212_internal_peripheral.xml" show="embed" type="simple"/> -</info> -</infoList> -</TargetConfig> - - - SDK_2.x_MK22FN512xxx12 - 2.3.1 - From 0344a79f65e333c6d8343d666f73c7e5f3d7fc39 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Sun, 6 May 2018 20:28:14 +0200 Subject: [PATCH 7/7] Updated the KSDK_2.0_MKL03Z8xxx4 submodule --- lib/KSDK_2.0_MKL03Z8xxx4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/KSDK_2.0_MKL03Z8xxx4 b/lib/KSDK_2.0_MKL03Z8xxx4 index 49e20a5..5157f60 160000 --- a/lib/KSDK_2.0_MKL03Z8xxx4 +++ b/lib/KSDK_2.0_MKL03Z8xxx4 @@ -1 +1 @@ -Subproject commit 49e20a57988572156b1df1c73c783c8e5e0dbb49 +Subproject commit 5157f6067c70b5e49927e09e2babc039227f958d