From 151c012fde27a8e60c59fc9aebb5089029d1c82f Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 13 Mar 2014 12:04:37 +0700 Subject: [PATCH] fix all build problem with keil & lpcxpresso for host os none, host freertos, device os none --- demos/device/device_os_none/.project | 12 ++--- .../device_os_none/device_os_none.uvopt | 16 +++--- .../device_os_none/device_os_none.uvproj | 52 +++++++++---------- demos/host/host_freertos/.cproject | 15 ++++-- demos/host/host_freertos/.project | 12 ++--- demos/host/host_freertos/host_freertos.uvopt | 18 +++---- demos/host/host_freertos/host_freertos.uvproj | 18 +++---- demos/host/host_os_none/.project | 12 ++--- demos/host/host_os_none/host_os_none.uvopt | 32 ++++++------ demos/host/host_os_none/host_os_none.uvproj | 18 +++---- 10 files changed, 106 insertions(+), 99 deletions(-) diff --git a/demos/device/device_os_none/.project b/demos/device/device_os_none/.project index 406c4de7..4f17e67a 100644 --- a/demos/device/device_os_none/.project +++ b/demos/device/device_os_none/.project @@ -103,21 +103,21 @@ - 1394632197708 - + 1394686778466 + mcu 26 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-startup_keil + 1.0-name-matches-false-false-iar - 1394632197724 - + 1394686778491 + mcu 26 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-startup_iar + 1.0-name-matches-false-false-keil diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt index 3f8a7e54..ee540d5e 100644 --- a/demos/device/device_os_none/device_os_none.uvopt +++ b/demos/device/device_os_none/device_os_none.uvopt @@ -932,7 +932,7 @@ 0 3 0 - 71 + 72 78 0 ..\src\main.c @@ -964,7 +964,7 @@ 0 23 0 - 98 + 119 128 0 ..\src\keyboardd_app.c @@ -1068,7 +1068,7 @@ 0 68 0 - 35 + 36 37 0 ..\..\..\tinyusb\tusb.c @@ -1388,7 +1388,7 @@ 0 5 0 - 228 + 229 232 0 ..\..\..\tinyusb\device\usbd.c @@ -1679,7 +1679,7 @@ 0 0 0 - ..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s startup_LPC11Uxx.s 0 0 @@ -1703,7 +1703,7 @@ 0 0 0 - ..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s startup_LPC13Uxx.s 0 0 @@ -1855,7 +1855,7 @@ 0 0 0 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s startup_LPC17xx.s 0 0 @@ -1991,7 +1991,7 @@ 0 0 0 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s startup_LPC43xx.s 0 0 diff --git a/demos/device/device_os_none/device_os_none.uvproj b/demos/device/device_os_none/device_os_none.uvproj index b54217a0..d1be63cb 100644 --- a/demos/device/device_os_none/device_os_none.uvproj +++ b/demos/device/device_os_none/device_os_none.uvproj @@ -690,7 +690,7 @@ startup_LPC11Uxx.s 2 - ..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s @@ -756,7 +756,7 @@ startup_LPC13Uxx.s 2 - ..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s system_LPC13Uxx.c @@ -862,7 +862,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -907,7 +907,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s @@ -1637,7 +1637,7 @@ startup_LPC11Uxx.s 2 - ..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s @@ -1703,7 +1703,7 @@ startup_LPC13Uxx.s 2 - ..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s system_LPC13Uxx.c @@ -1809,7 +1809,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -1854,7 +1854,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s @@ -2232,7 +2232,7 @@ 0 0x1A000000 0x10000000 - ..\..\..\mcu\lpc13uxx\startup_keil\lpc13uxx.sct + ..\..\..\mcu\lpc13uxx\keil\lpc13uxx.sct @@ -2544,7 +2544,7 @@ startup_LPC11Uxx.s 2 - ..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s @@ -2554,7 +2554,7 @@ startup_LPC13Uxx.s 2 - ..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s system_LPC13Uxx.c @@ -2660,7 +2660,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -2761,7 +2761,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s @@ -3451,7 +3451,7 @@ startup_LPC11Uxx.s 2 - ..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s @@ -3517,7 +3517,7 @@ startup_LPC13Uxx.s 2 - ..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s system_LPC13Uxx.c @@ -3567,7 +3567,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -3668,7 +3668,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s @@ -4046,7 +4046,7 @@ 0 0x1A000000 0x10000000 - ..\..\..\mcu\lpc11uxx\startup_keil\lpc11uxx.sct + ..\..\..\mcu\lpc11uxx\keil\lpc11uxx.sct @@ -4342,7 +4342,7 @@ startup_LPC11Uxx.s 2 - ..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s @@ -4408,7 +4408,7 @@ startup_LPC13Uxx.s 2 - ..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s system_LPC13Uxx.c @@ -4514,7 +4514,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -4615,7 +4615,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s @@ -5305,7 +5305,7 @@ startup_LPC11Uxx.s 2 - ..\..\..\mcu\lpc11uxx\startup_keil\startup_LPC11Uxx.s + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s @@ -5371,7 +5371,7 @@ startup_LPC13Uxx.s 2 - ..\..\..\mcu\lpc13uxx\startup_keil\startup_LPC13Uxx.s + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s system_LPC13Uxx.c @@ -5477,7 +5477,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -5522,7 +5522,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s diff --git a/demos/host/host_freertos/.cproject b/demos/host/host_freertos/.cproject index f6e871ba..1c7b8cc7 100644 --- a/demos/host/host_freertos/.cproject +++ b/demos/host/host_freertos/.cproject @@ -2761,8 +2761,8 @@ <?xml version="1.0" encoding="UTF-8"?> <TargetConfig> -<Properties property_0="" property_3="NXP" property_4="LPC4330" property_count="5" version="1"/> -<infoList vendor="NXP"><info chip="LPC4330" match_id="0x0" name="LPC4330" resetscript="LPC18LPC43ExternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4330</name> +<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="1"/> +<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" resetscript="LPC18LPC43InternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name> <family>LPC43xx</family> <vendor>NXP (formerly Philips)</vendor> <reset board="None" core="Real" sys="Real"/> @@ -2770,11 +2770,17 @@ <memory can_program="true" id="Flash" is_ro="true" type="Flash"/> <memory id="RAM" type="RAM"/> <memory id="Periph" is_volatile="true" type="Peripheral"/> -<memoryInstance derived_from="RAM" id="RamLoc128" location="0x10000000" size="0x20000"/> -<memoryInstance derived_from="RAM" id="RamLoc72" location="0x10080000" size="0x12000"/> +<memoryInstance derived_from="Flash" id="MFlashA512" location="0x1a000000" size="0x80000"/> +<memoryInstance derived_from="Flash" id="MFlashB512" location="0x1b000000" size="0x80000"/> +<memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/> +<memoryInstance derived_from="RAM" id="RamLoc40" location="0x10080000" size="0xa000"/> <memoryInstance derived_from="RAM" id="RamAHB32" location="0x20000000" size="0x8000"/> <memoryInstance derived_from="RAM" id="RamAHB16" location="0x20008000" size="0x4000"/> <memoryInstance derived_from="RAM" id="RamAHB_ETB16" location="0x2000c000" size="0x4000"/> +<prog_flash blocksz="0x2000" location="0x1a000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/> +<prog_flash blocksz="0x10000" location="0x1a010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/> +<prog_flash blocksz="0x2000" location="0x1b000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/> +<prog_flash blocksz="0x10000" location="0x1b010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/> <peripheralInstance derived_from="V7M_MPU" id="MPU" location="0xe000ed90"/> <peripheralInstance derived_from="V7M_NVIC" id="NVIC" location="0xe000e000"/> <peripheralInstance derived_from="V7M_DCR" id="DCR" location="0xe000edf0"/> @@ -2786,6 +2792,7 @@ <peripheralInstance derived_from="EMC" id="EMC" location="0x40005000"/> <peripheralInstance derived_from="USB0" id="USB0" location="0x40006000"/> <peripheralInstance derived_from="USB1" id="USB1" location="0x40007000"/> +<peripheralInstance derived_from="LCD" id="LCD" location="0x40008000"/> <peripheralInstance derived_from="EEPROM" id="EEPROM" location="0x4000e000"/> <peripheralInstance derived_from="ETHERNET" id="ETHERNET" location="0x40010000"/> <peripheralInstance derived_from="ATIMER" id="ATIMER" location="0x40040000"/> diff --git a/demos/host/host_freertos/.project b/demos/host/host_freertos/.project index cac4c13a..6f6b180e 100644 --- a/demos/host/host_freertos/.project +++ b/demos/host/host_freertos/.project @@ -113,21 +113,21 @@ - 1394642985711 - + 1394684566713 + mcu 26 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-startup_keil + 1.0-name-matches-false-false-iar - 1394642985721 - + 1394684566728 + mcu 26 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-startup_iar + 1.0-name-matches-false-false-keil diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt index 253d6d8b..ea04b496 100644 --- a/demos/host/host_freertos/host_freertos.uvopt +++ b/demos/host/host_freertos/host_freertos.uvopt @@ -73,7 +73,7 @@ 1 0 - 1 + 0 8 @@ -555,7 +555,7 @@ 1 0 - 0 + 1 8 @@ -620,7 +620,7 @@ - ..\..\..\mcu\lpc43xx\keil_ram.ini + ..\..\..\mcu\lpc43xx\keil\keil_ram.ini Segger\JL2CM3.dll @@ -706,7 +706,7 @@ 0 9 0 - 3 + 5 11 0 ..\src\main.c @@ -1168,10 +1168,10 @@ 1 0 0 - 37 + 0 0 - 22 - 39 + 41 + 49 0 ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c FreeRTOSCommonHooks.c @@ -1549,7 +1549,7 @@ 0 0 0 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s startup_LPC43xx.s 0 0 @@ -1749,7 +1749,7 @@ 0 0 0 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s startup_LPC17xx.s 0 0 diff --git a/demos/host/host_freertos/host_freertos.uvproj b/demos/host/host_freertos/host_freertos.uvproj index 50875c79..e53f8964 100644 --- a/demos/host/host_freertos/host_freertos.uvproj +++ b/demos/host/host_freertos/host_freertos.uvproj @@ -709,7 +709,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s lpc43xx_uart.c @@ -830,7 +830,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -1539,7 +1539,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s lpc43xx_uart.c @@ -1660,7 +1660,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -2425,7 +2425,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s lpc43xx_uart.c @@ -2490,7 +2490,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -2642,7 +2642,7 @@ - ..\..\..\mcu\lpc43xx\keil_ram.ini + ..\..\..\mcu\lpc43xx\keil\keil_ram.ini Segger\JL2CM3.dll @@ -3199,7 +3199,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s lpc43xx_uart.c @@ -3320,7 +3320,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s diff --git a/demos/host/host_os_none/.project b/demos/host/host_os_none/.project index b35d021e..c73cfecb 100644 --- a/demos/host/host_os_none/.project +++ b/demos/host/host_os_none/.project @@ -108,21 +108,21 @@ - 1394619722725 - + 1394685086167 + mcu 26 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-startup_iar + 1.0-name-matches-false-false-iar - 1394619722739 - + 1394685086182 + mcu 26 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-startup_keil + 1.0-name-matches-false-false-keil diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index f618fea9..5b7d1826 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -499,7 +499,7 @@ 1 0 - 1 + 0 8 @@ -713,7 +713,7 @@ 1 0 - 0 + 1 8 @@ -778,7 +778,7 @@ - ..\..\..\mcu\lpc43xx\keil_ram.ini + ..\..\..\mcu\lpc43xx\keil\keil_ram.ini Segger\JL2CM3.dll @@ -916,10 +916,10 @@ 1 0 0 - 6 + 1 0 - 103 - 115 + 106 + 114 0 ..\src\main.c main.c @@ -934,7 +934,7 @@ 0 61 0 - 119 + 120 121 0 ..\src\cdc_serial_app.c @@ -998,7 +998,7 @@ 0 0 0 - 124 + 139 149 0 ..\src\msc_app.c @@ -1014,7 +1014,7 @@ 0 40 0 - 213 + 228 238 0 ..\src\cli.c @@ -1462,7 +1462,7 @@ 0 43 0 - 1 + 5 15 0 ..\..\..\vendor\fatfs\diskio.c @@ -1674,7 +1674,7 @@ bsp lpc43xx - 1 + 0 0 0 0 @@ -1684,12 +1684,12 @@ 2 0 0 - 35 + 0 0 - 138 - 148 + 0 + 0 0 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s startup_LPC43xx.s 0 0 @@ -1889,7 +1889,7 @@ 0 0 0 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s startup_LPC17xx.s 0 0 diff --git a/demos/host/host_os_none/host_os_none.uvproj b/demos/host/host_os_none/host_os_none.uvproj index e4fa643b..4e639ebf 100644 --- a/demos/host/host_os_none/host_os_none.uvproj +++ b/demos/host/host_os_none/host_os_none.uvproj @@ -644,7 +644,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s system_LPC43xx.c @@ -765,7 +765,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -1409,7 +1409,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s system_LPC43xx.c @@ -1530,7 +1530,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -2230,7 +2230,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s system_LPC43xx.c @@ -2295,7 +2295,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s @@ -2447,7 +2447,7 @@ - ..\..\..\mcu\lpc43xx\keil_ram.ini + ..\..\..\mcu\lpc43xx\keil\keil_ram.ini Segger\JL2CM3.dll @@ -2939,7 +2939,7 @@ startup_LPC43xx.s 2 - ..\..\..\mcu\lpc43xx\startup_keil\startup_LPC43xx.s + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s system_LPC43xx.c @@ -3060,7 +3060,7 @@ startup_LPC17xx.s 2 - ..\..\..\mcu\lpc175x_6x\startup_keil\startup_LPC17xx.s + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s