diff options
| author | ArdaFu <[email protected]> | 2014-07-20 00:16:37 +0800 |
|---|---|---|
| committer | ArdaFu <[email protected]> | 2014-07-20 00:16:37 +0800 |
| commit | f74d7f16c0694b01c190b9b00a1f3e8dab9d662d (patch) | |
| tree | 7676636087c05804708b2da114b97dccf70aed34 /bsp/tm4c129x | |
| parent | 3a1c1c45002e420f35433544138c2c357942a349 (diff) | |
[bsp] modify the uart_driver to fit the new rt-thread serial device driver framework. Modify the template.uvproj for auto generate MDK project.
Diffstat (limited to 'bsp/tm4c129x')
| -rw-r--r-- | bsp/tm4c129x/applications/application.c | 3 | ||||
| -rw-r--r-- | bsp/tm4c129x/applications/board.c | 34 | ||||
| -rw-r--r-- | bsp/tm4c129x/drivers/drv_uart.c | 143 | ||||
| -rw-r--r-- | bsp/tm4c129x/project.uvproj | 851 | ||||
| -rw-r--r-- | bsp/tm4c129x/template.uvproj | 77 |
5 files changed, 151 insertions, 957 deletions
diff --git a/bsp/tm4c129x/applications/application.c b/bsp/tm4c129x/applications/application.c index 3c07bb6128..80f58b6ed8 100644 --- a/bsp/tm4c129x/applications/application.c +++ b/bsp/tm4c129x/applications/application.c @@ -20,8 +20,9 @@ void rt_init_thread_entry(void *parameter) { /* Initialization RT-Thread Components */ -#ifdef RT_USING_COMPONENTS_INIT rt_components_init(); +#ifdef RT_USING_FINSH + finsh_set_device(RT_CONSOLE_DEVICE_NAME); #endif } diff --git a/bsp/tm4c129x/applications/board.c b/bsp/tm4c129x/applications/board.c index e26f3f5076..cb3cf92eb6 100644 --- a/bsp/tm4c129x/applications/board.c +++ b/bsp/tm4c129x/applications/board.c @@ -15,14 +15,14 @@ #include <rthw.h> #include <rtthread.h> -#include <components.h> #include "board.h" #include "drv_uart.h" -#include "interrupt.h" -#include "sysctl.h" -#include "systick.h" -#include "fpu.h" + +#include "driverlib/interrupt.h" +#include "driverlib/sysctl.h" +#include "driverlib/systick.h" +#include "driverlib/fpu.h" #include "driverlib/rom_map.h" #define SYS_CLOCK_DEFAULT 120000000 @@ -56,16 +56,15 @@ void SysTick_Handler(void) extern void PendSV_Handler(void); extern void HardFault_Handler(void); - /** * This function will initial LPC40xx board. */ void rt_hw_board_init() { IntRegister(FAULT_HARD, HardFault_Handler); - IntRegister(FAULT_PENDSV, PendSV_Handler); - IntRegister(FAULT_SYSTICK, SysTick_Handler); - + IntRegister(FAULT_PENDSV, PendSV_Handler); + IntRegister(FAULT_SYSTICK, SysTick_Handler); + // // Enable lazy stacking for interrupt handlers. This allows floating-point // instructions to be used within interrupt handlers, but at the expense of @@ -78,23 +77,24 @@ void rt_hw_board_init() // TODO: The SYSCTL_XTAL_ value must be changed to match the value of the // crystal on your board. // - SysClock = MAP_SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ | SYSCTL_OSC_MAIN | SYSCTL_USE_PLL | SYSCTL_CFG_VCO_480), - SYS_CLOCK_DEFAULT); + SysClock = MAP_SysCtlClockFreqSet( + (SYSCTL_XTAL_25MHZ | SYSCTL_OSC_MAIN | SYSCTL_USE_PLL | SYSCTL_CFG_VCO_480), + SYS_CLOCK_DEFAULT); - MAP_SysTickDisable(); + MAP_SysTickDisable(); MAP_SysTickPeriodSet(SysClock/ RT_TICK_PER_SECOND - 1); MAP_SysTickIntEnable(); MAP_SysTickEnable(); - /* set pend exception priority */ - //IntPrioritySet(FAULT_PENDSV, (1 << __NVIC_PRIO_BITS) - 1); - /*init uart device*/ - + IntPrioritySet(FAULT_PENDSV, (1 << 5) - 1); + + /*init uart device*/ rt_hw_uart_init(); + //redirect RTT stdio to CONSOLE device rt_console_set_device(RT_CONSOLE_DEVICE_NAME); // // Enable interrupts to the processor. // - MAP_IntMasterEnable(); + MAP_IntMasterEnable(); } diff --git a/bsp/tm4c129x/drivers/drv_uart.c b/bsp/tm4c129x/drivers/drv_uart.c index eba5eff67a..7f87083999 100644 --- a/bsp/tm4c129x/drivers/drv_uart.c +++ b/bsp/tm4c129x/drivers/drv_uart.c @@ -20,41 +20,83 @@ #include "board.h" //#include <components.h> -#include "sysctl.h" -#include "gpio.h" -#include "uart.h" -#include "hw_memmap.h" -#include "pin_map.h" -#include "interrupt.h" -#include "rom.h" -#include "rom_map.h" +#include "inc/hw_memmap.h" +#include "driverlib/sysctl.h" +#include "driverlib/gpio.h" +#include "driverlib/uart.h" +#include "driverlib/pin_map.h" +#include "driverlib/interrupt.h" +#include "driverlib/rom_map.h" typedef struct hw_uart_device { uint32_t hw_base; // base address }hw_uart_t; -#define GetHwUartPtr(serial) ((hw_uart_t*)(serial->parent.user_data)) +#define mUartGetHwPtr(serial) ((hw_uart_t*)(serial->parent.user_data)) static rt_err_t hw_configure(struct rt_serial_device *serial, struct serial_configure *cfg) { + uint32_t config; hw_uart_t* uart; RT_ASSERT(serial != RT_NULL); - uart = GetHwUartPtr(serial); + uart = mUartGetHwPtr(serial); + MAP_UARTDisable(uart->hw_base); - /* Initialize UART Configuration parameter structure to default state: - * Baudrate = 115200 bps - * 8 data bit - * 1 Stop bit - * None parity - */ - // Initialize UART0 peripheral with given to corresponding parameter - MAP_UARTConfigSetExpClk(uart->hw_base, SysClock, cfg->baud_rate, - (UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | UART_CONFIG_PAR_NONE)); - MAP_UARTFIFOEnable(uart->hw_base); + // build UART Configuration parameter structure + switch(cfg->data_bits) + { + case DATA_BITS_9: + // enable 9bit address mode and set DATA_BIT_8 + MAP_UART9BitEnable(uart->hw_base); + case DATA_BITS_8: + config |= UART_CONFIG_WLEN_8; + break; + case DATA_BITS_7: + config |= UART_CONFIG_WLEN_7; + break; + case DATA_BITS_6: + config |= UART_CONFIG_WLEN_6; + break; + case DATA_BITS_5: + config |= UART_CONFIG_WLEN_5; + break; + default: + RT_ASSERT(0); + break; + } + switch(cfg->parity) + { + case PARITY_ODD: + config |= UART_CONFIG_PAR_ODD; + break; + case PARITY_EVEN: + config |= UART_CONFIG_PAR_EVEN; + break; + case PARITY_NONE: + config |= UART_CONFIG_PAR_NONE; + break; + default: + RT_ASSERT(0); + break; + } + switch(cfg->stop_bits) + { + case STOP_BITS_1: + config |= UART_CONFIG_STOP_ONE; + break; + case STOP_BITS_2: + config |= UART_CONFIG_STOP_TWO; + break; + default: + RT_ASSERT(0); + break; + } + + // Initialize UART0 peripheral with given to corresponding parameter + MAP_UARTConfigSetExpClk(uart->hw_base, SysClock, cfg->baud_rate, config); + MAP_UARTFIFOEnable(uart->hw_base); - // // Enable the UART. - // MAP_UARTEnable(uart->hw_base); return RT_EOK; } @@ -63,7 +105,7 @@ static rt_err_t hw_control(struct rt_serial_device *serial, int cmd, void *arg) { hw_uart_t* uart; RT_ASSERT(serial != RT_NULL); - uart = GetHwUartPtr(serial); + uart = mUartGetHwPtr(serial); switch (cmd) { @@ -84,7 +126,7 @@ static int hw_putc(struct rt_serial_device *serial, char c) { hw_uart_t* uart; RT_ASSERT(serial != RT_NULL); - uart = GetHwUartPtr(serial); + uart = mUartGetHwPtr(serial); MAP_UARTCharPut(uart->hw_base, *((uint8_t *)&c)); return 1; @@ -94,7 +136,7 @@ static int hw_getc(struct rt_serial_device *serial) { hw_uart_t* uart; RT_ASSERT(serial != RT_NULL); - uart = GetHwUartPtr(serial); + uart = mUartGetHwPtr(serial); return MAP_UARTCharGetNonBlocking(uart->hw_base); } @@ -110,7 +152,6 @@ static const struct rt_uart_ops hw_uart_ops = #if defined(RT_USING_UART0) /* UART0 device driver structure */ struct rt_serial_device serial0; -struct serial_ringbuffer uart0_int_rx_buf; hw_uart_t uart0 = { UART0_BASE, @@ -118,21 +159,20 @@ hw_uart_t uart0 = void UART0_IRQHandler(void) { - uint32_t intsrc; + uint32_t intsrc; hw_uart_t *uart = &uart0; /* enter interrupt */ rt_interrupt_enter(); /* Determine the interrupt source */ - intsrc = UARTIntStatus(uart->hw_base, true); + intsrc = MAP_UARTIntStatus(uart->hw_base, true); // Receive Data Available or Character time-out if (intsrc & (UART_INT_RX | UART_INT_RT)) { - UARTIntClear(UART0_BASE, intsrc); - rt_hw_serial_isr(&serial0); - + MAP_UARTIntClear(uart->hw_base, intsrc); + rt_hw_serial_isr(&serial0, RT_SERIAL_EVENT_RX_IND); } /* leave interrupt */ @@ -144,57 +184,38 @@ int rt_hw_uart_init(void) { hw_uart_t* uart; struct serial_configure config; - -#ifdef RT_USING_UART0 - uart = &uart0; + config.baud_rate = BAUD_RATE_115200; config.bit_order = BIT_ORDER_LSB; config.data_bits = DATA_BITS_8; config.parity = PARITY_NONE; config.stop_bits = STOP_BITS_1; config.invert = NRZ_NORMAL; - + config.bufsz = RT_SERIAL_RB_BUFSZ; + +#ifdef RT_USING_UART0 + uart = &uart0; serial0.ops = &hw_uart_ops; - serial0.int_rx = &uart0_int_rx_buf; serial0.config = config; - // - // Enable the peripherals used by this example. - // The UART itself needs to be enabled, as well as the GPIO port - // containing the pins that will be used. - // - MAP_SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOA); - - // - // Configure the GPIO pin muxing for the UART function. - // This is only necessary if your part supports GPIO pin function muxing. - // Study the data sheet to see which functions are allocated per pin. - // TODO: change this to select the port/pin you are using - // MAP_GPIOPinConfigure(GPIO_PA0_U0RX); MAP_GPIOPinConfigure(GPIO_PA1_U0TX); - - // - // Since GPIO A0 and A1 are used for the UART function, they must be - // configured for use as a peripheral function (instead of GPIO). - // TODO: change this to match the port/pin you are using - // + MAP_GPIOPinTypeUART(GPIO_PORTA_BASE, GPIO_PIN_0 | GPIO_PIN_1); - MAP_SysCtlPeripheralEnable(SYSCTL_PERIPH_UART0); /* preemption = 1, sub-priority = 1 */ - //IntPrioritySet(INT_UART0, ((0x01 << 3) | 0x01)); + IntPrioritySet(INT_UART0, ((0x01 << 5) | 0x01)); /* Enable Interrupt for UART channel */ - UARTIntRegister(uart->hw_base, UART0_IRQHandler); - MAP_IntEnable(INT_UART0); - MAP_UARTEnable(uart->hw_base); + UARTIntRegister(uart->hw_base, UART0_IRQHandler); + MAP_IntEnable(INT_UART0); + MAP_UARTEnable(uart->hw_base); /* register UART0 device */ rt_hw_serial_register(&serial0, "uart0", - RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM, + RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, uart); #endif return 0; diff --git a/bsp/tm4c129x/project.uvproj b/bsp/tm4c129x/project.uvproj deleted file mode 100644 index ea427a1500..0000000000 --- a/bsp/tm4c129x/project.uvproj +++ /dev/null @@ -1,851 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_proj.xsd"> - - <SchemaVersion>1.1</SchemaVersion> - - <Header>### uVision Project, (C) Keil Software</Header> - - <Targets> - <Target> - <TargetName>Target 1</TargetName> - <ToolsetNumber>0x4</ToolsetNumber> - <ToolsetName>ARM-ADS</ToolsetName> - <TargetOption> - <TargetCommonOption> - <Device>TM4C1294NCZAD</Device> - <Vendor>Texas Instruments</Vendor> - <Cpu>IROM(0x00000000,0x100000) IRAM(0x20000000,0x040000) CPUTYPE("Cortex-M4") FPU2 CLOCK(120000000) ELITTLE</Cpu> - <FlashUtilSpec></FlashUtilSpec> - <StartupFile></StartupFile> - <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0TM4C129_1024 -FS00 -FL0100000 -FP0($$Device:TM4C1294NCZAD$Flash\TM4C129_1024.FLM))</FlashDriverDll> - <DeviceId>7089</DeviceId> - <RegisterFile>$$Device:TM4C1294NCZAD$Device\Include\TM4C129\TM4C129.h</RegisterFile> - <MemoryEnv></MemoryEnv> - <Cmp></Cmp> - <Asm></Asm> - <Linker></Linker> - <OHString></OHString> - <InfinionOptionDll></InfinionOptionDll> - <SLE66CMisc>-DTM4C1294NCZAD</SLE66CMisc> - <SLE66AMisc></SLE66AMisc> - <SLE66LinkerMisc></SLE66LinkerMisc> - <SFDFile>$$Device:TM4C1294NCZAD$SVD\TM4C129\TM4C1294NCZAD.svd</SFDFile> - <bCustSvd>0</bCustSvd> - <UseEnv>0</UseEnv> - <BinPath></BinPath> - <IncludePath></IncludePath> - <LibPath></LibPath> - <RegisterFilePath></RegisterFilePath> - <DBRegisterFilePath></DBRegisterFilePath> - <TargetStatus> - <Error>0</Error> - <ExitCodeStop>0</ExitCodeStop> - <ButtonStop>0</ButtonStop> - <NotGenerated>0</NotGenerated> - <InvalidFlash>1</InvalidFlash> - </TargetStatus> - <OutputDirectory>.\keil_bulid\</OutputDirectory> - <OutputName>project</OutputName> - <CreateExecutable>1</CreateExecutable> - <CreateLib>0</CreateLib> - <CreateHexFile>0</CreateHexFile> - <DebugInformation>1</DebugInformation> - <BrowseInformation>1</BrowseInformation> - <ListingPath>.\keil_bulid\</ListingPath> - <HexFormatSelection>1</HexFormatSelection> - <Merge32K>0</Merge32K> - <CreateBatchFile>1</CreateBatchFile> - <BeforeCompile> - <RunUserProg1>0</RunUserProg1> - <RunUserProg2>0</RunUserProg2> - <UserProg1Name></UserProg1Name> - <UserProg2Name></UserProg2Name> - <UserProg1Dos16Mode>0</UserProg1Dos16Mode> - <UserProg2Dos16Mode>0</UserProg2Dos16Mode> - <nStopU1X>0</nStopU1X> - <nStopU2X>0</nStopU2X> - </BeforeCompile> - <BeforeMake> - <RunUserProg1>0</RunUserProg1> - <RunUserProg2>0</RunUserProg2> - <UserProg1Name></UserProg1Name> - <UserProg2Name></UserProg2Name> - <UserProg1Dos16Mode>0</UserProg1Dos16Mode> - <UserProg2Dos16Mode>0</UserProg2Dos16Mode> - <nStopB1X>0</nStopB1X> - <nStopB2X>0</nStopB2X> - </BeforeMake> - <AfterMake> - <RunUserProg1>0</RunUserProg1> - <RunUserProg2>0</RunUserProg2> - <UserProg1Name></UserProg1Name> - <UserProg2Name></UserProg2Name> - <UserProg1Dos16Mode>0</UserProg1Dos16Mode> - <UserProg2Dos16Mode>0</UserProg2Dos16Mode> - </AfterMake> - <SelectedForBatchBuild>0</SelectedForBatchBuild> - <SVCSIdString></SVCSIdString> - </TargetCommonOption> - <CommonProperty> - <UseCPPCompiler>0</UseCPPCompiler> - <RVCTCodeConst>0</RVCTCodeConst> - <RVCTZI>0</RVCTZI> - <RVCTOtherData>0</RVCTOtherData> - <ModuleSelection>0</ModuleSelection> - <IncludeInBuild>1</IncludeInBuild> - <AlwaysBuild>0</AlwaysBuild> - <GenerateAssemblyFile>0</GenerateAssemblyFile> - <AssembleAssemblyFile>0</AssembleAssemblyFile> - <PublicsOnly>0</PublicsOnly> - <StopOnExitCode>3</StopOnExitCode> - <CustomArgument></CustomArgument> - <IncludeLibraryModules></IncludeLibraryModules> - <ComprImg>1</ComprImg> - </CommonProperty> - <DllOption> - <SimDllName>SARMCM3.DLL</SimDllName> - <SimDllArguments>-MPU</SimDllArguments> - <SimDlgDll>DCM.DLL</SimDlgDll> - <SimDlgDllArguments>-pCM4</SimDlgDllArguments> - <TargetDllName>SARMCM3.DLL</TargetDllName> - <TargetDllArguments>-MPU</TargetDllArguments> - <TargetDlgDll>TCM.DLL</TargetDlgDll> - <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments> - </DllOption> - <DebugOption> - <OPTHX> - <HexSelection>1</HexSelection> - <HexRangeLowAddress>0</HexRangeLowAddress> - <HexRangeHighAddress>0</HexRangeHighAddress> - <HexOffset>0</HexOffset> - <Oh166RecLen>16</Oh166RecLen> - </OPTHX> - <Simulator> - <UseSimulator>0</UseSimulator> - <LoadApplicationAtStartup>1</LoadApplicationAtStartup> - <RunToMain>1</RunToMain> - <RestoreBreakpoints>1</RestoreBreakpoints> - <RestoreWatchpoints>1</RestoreWatchpoints> - <RestoreMemoryDisplay>1</RestoreMemoryDisplay> - <RestoreFunctions>1</RestoreFunctions> - <RestoreToolbox>1</RestoreToolbox> - <LimitSpeedToRealTime>0</LimitSpeedToRealTime> - <RestoreSysVw>1</RestoreSysVw> - </Simulator> - <Target> - <UseTarget>1</UseTarget> - <LoadApplicationAtStartup>1</LoadApplicationAtStartup> - <RunToMain>1</RunToMain> - <RestoreBreakpoints>1</RestoreBreakpoints> - <RestoreWatchpoints>1</RestoreWatchpoints> - <RestoreMemoryDisplay>1</RestoreMemoryDisplay> - <RestoreFunctions>0</RestoreFunctions> - <RestoreToolbox>1</RestoreToolbox> - <RestoreTracepoints>1</RestoreTracepoints> - <RestoreSysVw>1</RestoreSysVw> - <UsePdscDebugDescription>1</UsePdscDebugDescription> - </Target> - <RunDebugAfterBuild>0</RunDebugAfterBuild> - <TargetSelection>3</TargetSelection> - <SimDlls> - <CpuDll></CpuDll> - <CpuDllArguments></CpuDllArguments> - <PeripheralDll></PeripheralDll> - <PeripheralDllArguments></PeripheralDllArguments> - <InitializationFile></InitializationFile> - </SimDlls> - <TargetDlls> - <CpuDll></CpuDll> - <CpuDllArguments></CpuDllArguments> - <PeripheralDll></PeripheralDll> - <PeripheralDllArguments></PeripheralDllArguments> - <InitializationFile></InitializationFile> - <Driver>BIN\lmidk-agdi.dll</Driver> - </TargetDlls> - </DebugOption> - <Utilities> - <Flash1> - <UseTargetDll>1</UseTargetDll> - <UseExternalTool>0</UseExternalTool> - <RunIndependent>0</RunIndependent> - <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging> - <Capability>1</Capability> - <DriverSelection>4096</DriverSelection> - </Flash1> - <bUseTDR>1</bUseTDR> - <Flash2>BIN\UL2CM3.DLL</Flash2> - <Flash3>"" ()</Flash3> - <Flash4></Flash4> - <pFcarmOut></pFcarmOut> - <pFcarmGrp></pFcarmGrp> - <pFcArmRoot></pFcArmRoot> - <FcArmLst>0</FcArmLst> - </Utilities> - <TargetArmAds> - <ArmAdsMisc> - <GenerateListings>0</GenerateListings> - <asHll>1</asHll> - <asAsm>1</asAsm> - <asMacX>1</asMacX> - <asSyms>1</asSyms> - <asFals>1</asFals> - <asDbgD>1</asDbgD> - <asForm>1</asForm> - <ldLst>0</ldLst> - <ldmm>1</ldmm> - <ldXref>1</ldXref> - <BigEnd>0</BigEnd> - <AdsALst>1</AdsALst> - <AdsACrf>1</AdsACrf> - <AdsANop>0</AdsANop> - <AdsANot>0</AdsANot> - <AdsLLst>1</AdsLLst> - <AdsLmap>1</AdsLmap> - <AdsLcgr>1</AdsLcgr> - <AdsLsym>1</AdsLsym> - <AdsLszi>1</AdsLszi> - <AdsLtoi>1</AdsLtoi> - <AdsLsun>1</AdsLsun> - <AdsLven>1</AdsLven> - <AdsLsxf>1</AdsLsxf> - <RvctClst>0</RvctClst> - <GenPPlst>0</GenPPlst> - <AdsCpuType>"Cortex-M4"</AdsCpuType> - <RvctDeviceName></RvctDeviceName> - <mOS>0</mOS> - <uocRom>0</uocRom> - <uocRam>0</uocRam> - <hadIROM>1</hadIROM> - <hadIRAM>1</hadIRAM> - <hadXRAM>0</hadXRAM> - <uocXRam>0</uocXRam> - <RvdsVP>2</RvdsVP> - <hadIRAM2>0</hadIRAM2> - <hadIROM2>0</hadIROM2> - <StupSel>8</StupSel> - <useUlib>0</useUlib> - <EndSel>0</EndSel> - <uLtcg>0</uLtcg> - <RoSelD>3</RoSelD> - <RwSelD>3</RwSelD> - <CodeSel>0</CodeSel> - <OptFeed>0</OptFeed> - <NoZi1>0</NoZi1> - <NoZi2>0</NoZi2> - <NoZi3>0</NoZi3> - <NoZi4>0</NoZi4> - <NoZi5>0</NoZi5> - <Ro1Chk>0</Ro1Chk> - <Ro2Chk>0</Ro2Chk> - <Ro3Chk>0</Ro3Chk> - <Ir1Chk>1</Ir1Chk> - <Ir2Chk>0</Ir2Chk> - <Ra1Chk>0</Ra1Chk> - <Ra2Chk>0</Ra2Chk> - <Ra3Chk>0</Ra3Chk> - <Im1Chk>1</Im1Chk> - <Im2Chk>0</Im2Chk> - <OnChipMemories> - <Ocm1> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </Ocm1> - <Ocm2> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </Ocm2> - <Ocm3> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </Ocm3> - <Ocm4> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </Ocm4> - <Ocm5> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </Ocm5> - <Ocm6> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </Ocm6> - <IRAM> - <Type>0</Type> - <StartAddress>0x20000000</StartAddress> - <Size>0x40000</Size> - </IRAM> - <IROM> - <Type>1</Type> - <StartAddress>0x0</StartAddress> - <Size>0x100000</Size> - </IROM> - <XRAM> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </XRAM> - <OCR_RVCT1> - <Type>1</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT1> - <OCR_RVCT2> - <Type>1</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT2> - <OCR_RVCT3> - <Type>1</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT3> - <OCR_RVCT4> - <Type>1</Type> - <StartAddress>0x0</StartAddress> - <Size>0x100000</Size> - </OCR_RVCT4> - <OCR_RVCT5> - <Type>1</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT5> - <OCR_RVCT6> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT6> - <OCR_RVCT7> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT7> - <OCR_RVCT8> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT8> - <OCR_RVCT9> - <Type>0</Type> - <StartAddress>0x20000000</StartAddress> - <Size>0x40000</Size> - </OCR_RVCT9> - <OCR_RVCT10> - <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> - </OCR_RVCT10> - </OnChipMemories> - <RvctStartVector></RvctStartVector> - </ArmAdsMisc> - <Cads> - <interw>1</interw> - <Optim>1</Optim> - <oTime>0</oTime> - <SplitLS>0</SplitLS> - <OneElfS>0</OneElfS> - <Strict>0</Strict> - <EnumInt>0</EnumInt> - <PlainCh>0</PlainCh> - <Ropi>0</Ropi> - <Rwpi>0</Rwpi> - <wLevel>2</wLevel> - <uThumb>0</uThumb> - <uSurpInc>0</uSurpInc> - <uC99>0</uC99> - <useXO>0</useXO> - <VariousControls> - <MiscControls></MiscControls> - <Define>PART_TM4C129XNCZAD</Define> - <Undefine></Undefine> - <IncludePath>..\..\src;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include\drivers;..\..\components\finsh;..\tm4c129x;.\libraries\driverlib;.\libraries\inc;.\libraries\startup;.\libraries;.\drivers;.\applications;..\..\components\init</IncludePath> - </VariousControls> - </Cads> - <Aads> - <interw>1</interw> - <Ropi>0</Ropi> - <Rwpi>0</Rwpi> - <thumb>0</thumb> - <SplitLS>0</SplitLS> - <SwStkChk>0</SwStkChk> - <NoWarn>0</NoWarn> - <uSurpInc>0</uSurpInc> - <useXO>0</useXO> - <VariousControls> - <MiscControls></MiscControls> - <Define>PART_TM4C129XNCZAD</Define> - <Undefine></Undefine> - <IncludePath></IncludePath> - </VariousControls> - </Aads> - <LDads> - <umfTarg>0</umfTarg> - <Ropi>0</Ropi> - <Rwpi>1</Rwpi> - <noStLib>0</noStLib> - <RepFail>1</RepFail> - <useFile>0</useFile> - <TextAddressRange>0x00000000</TextAddressRange> - <DataAddressRange>0x00000000</DataAddressRange> - <pXoBase></pXoBase> - <ScatterFile>project.sct</ScatterFile> - <IncludeLibs></IncludeLibs> - <IncludeLibsPath></IncludeLibsPath> - <Misc></Misc> - <LinkerInputFile></LinkerInputFile> - <DisabledWarnings></DisabledWarnings> - </LDads> - </TargetArmAds> - </TargetOption> - <Groups> - <Group> - <GroupName>applcaitions</GroupName> - <Files> - <File> - <FileName>application.c</FileName> - <FileType>1</FileType> - <FilePath>.\applications\application.c</FilePath> - </File> - <File> - <FileName>board.c</FileName> - <FileType>1</FileType> - <FilePath>.\applications\board.c</FilePath> - </File> - <File> - <FileName>startup.c</FileName> - <FileType>1</FileType> - <FilePath>.\applications\startup.c</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>drivers</GroupName> - <Files> - <File> - <FileName>drv_uart.c</FileName> - <FileType>1</FileType> - <FilePath>.\drivers\drv_uart.c</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>libraries</GroupName> - <Files> - <File> - <FileName>adc.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\adc.c</FilePath> - </File> - <File> - <FileName>aes.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\aes.c</FilePath> - </File> - <File> - <FileName>can.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\can.c</FilePath> - </File> - <File> - <FileName>comp.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\comp.c</FilePath> - </File> - <File> - <FileName>cpu.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\cpu.c</FilePath> - </File> - <File> - <FileName>crc.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\crc.c</FilePath> - </File> - <File> - <FileName>des.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\des.c</FilePath> - </File> - <File> - <FileName>eeprom.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\eeprom.c</FilePath> - </File> - <File> - <FileName>emac.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\emac.c</FilePath> - </File> - <File> - <FileName>epi.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\epi.c</FilePath> - </File> - <File> - <FileName>flash.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\flash.c</FilePath> - </File> - <File> - <FileName>fpu.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\fpu.c</FilePath> - </File> - <File> - <FileName>gpio.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\gpio.c</FilePath> - </File> - <File> - <FileName>hibernate.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\hibernate.c</FilePath> - </File> - <File> - <FileName>i2c.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\i2c.c</FilePath> - </File> - <File> - <FileName>interrupt.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\interrupt.c</FilePath> - </File> - <File> - <FileName>lcd.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\lcd.c</FilePath> - </File> - <File> - <FileName>mpu.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\mpu.c</FilePath> - </File> - <File> - <FileName>pwm.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\pwm.c</FilePath> - </File> - <File> - <FileName>qei.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\qei.c</FilePath> - </File> - <File> - <FileName>shamd5.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\shamd5.c</FilePath> - </File> - <File> - <FileName>ssi.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\ssi.c</FilePath> - </File> - <File> - <FileName>sw_crc.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\sw_crc.c</FilePath> - </File> - <File> - <FileName>sysctl.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\sysctl.c</FilePath> - </File> - <File> - <FileName>sysexc.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\sysexc.c</FilePath> - </File> - <File> - <FileName>systick.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\systick.c</FilePath> - </File> - <File> - <FileName>uart.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\uart.c</FilePath> - </File> - <File> - <FileName>udma.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\udma.c</FilePath> - </File> - <File> - <FileName>usb.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\usb.c</FilePath> - </File> - <File> - <FileName>watchdog.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\watchdog.c</FilePath> - </File> - <File> - <FileName>startup_rvmdk.S</FileName> - <FileType>2</FileType> - <FilePath>.\libraries\startup\startup_rvmdk.S</FilePath> - </File> - <File> - <FileName>tiva_timer.c</FileName> - <FileType>1</FileType> - <FilePath>.\libraries\driverlib\tiva_timer.c</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>rt_core</GroupName> - <Files> - <File> - <FileName>clock.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\clock.c</FilePath> - </File> - <File> - <FileName>device.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\device.c</FilePath> - </File> - <File> - <FileName>idle.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\idle.c</FilePath> - </File> - <File> - <FileName>ipc.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\ipc.c</FilePath> - </File> - <File> - <FileName>irq.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\irq.c</FilePath> - </File> - <File> - <FileName>kservice.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\kservice.c</FilePath> - </File> - <File> - <FileName>mem.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\mem.c</FilePath> - </File> - <File> - <FileName>memheap.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\memheap.c</FilePath> - </File> - <File> - <FileName>mempool.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\mempool.c</FilePath> - </File> - <File> - <FileName>module.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\module.c</FilePath> - </File> - <File> - <FileName>object.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\object.c</FilePath> - </File> - <File> - <FileName>scheduler.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\scheduler.c</FilePath> - </File> - <File> - <FileName>slab.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\slab.c</FilePath> - </File> - <File> - <FileName>thread.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\thread.c</FilePath> - </File> - <File> - <FileName>timer.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\src\timer.c</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>finsh</GroupName> - <Files> - <File> - <FileName>cmd.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\cmd.c</FilePath> - </File> - <File> - <FileName>finsh_compiler.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_compiler.c</FilePath> - </File> - <File> - <FileName>finsh_error.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_error.c</FilePath> - </File> - <File> - <FileName>finsh_heap.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_heap.c</FilePath> - </File> - <File> - <FileName>finsh_init.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_init.c</FilePath> - </File> - <File> - <FileName>finsh_node.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_node.c</FilePath> - </File> - <File> - <FileName>finsh_ops.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_ops.c</FilePath> - </File> - <File> - <FileName>finsh_parser.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_parser.c</FilePath> - </File> - <File> - <FileName>finsh_token.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_token.c</FilePath> - </File> - <File> - <FileName>finsh_var.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_var.c</FilePath> - </File> - <File> - <FileName>finsh_vm.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_vm.c</FilePath> - </File> - <File> - <FileName>msh.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\msh.c</FilePath> - </File> - <File> - <FileName>msh_cmd.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\msh_cmd.c</FilePath> - </File> - <File> - <FileName>shell.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\shell.c</FilePath> - </File> - <File> - <FileName>symbol.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\symbol.c</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>rt_hw</GroupName> - <Files> - <File> - <FileName>serial.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\drivers\serial\serial.c</FilePath> - </File> - <File> - <FileName>completion.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\completion.c</FilePath> - </File> - <File> - <FileName>dataqueue.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\dataqueue.c</FilePath> - </File> - <File> - <FileName>pipe.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\pipe.c</FilePath> - </File> - <File> - <FileName>portal.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\portal.c</FilePath> - </File> - <File> - <FileName>ringbuffer.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\ringbuffer.c</FilePath> - </File> - <File> - <FileName>workqueue.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\workqueue.c</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>rt_components</GroupName> - <Files> - <File> - <FileName>components.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\init\components.c</FilePath> - </File> - <File> - <FileName>rtconfig.h</FileName> - <FileType>5</FileType> - <FilePath>.\rtconfig.h</FilePath> - </File> - </Files> - </Group> - <Group> - <GroupName>cpusupport</GroupName> - <Files> - <File> - <FileName>cpuport.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\libcpu\arm\cortex-m4\cpuport.c</FilePath> - </File> - <File> - <FileName>context_rvds.S</FileName> - <FileType>2</FileType> - <FilePath>..\..\libcpu\arm\cortex-m4\context_rvds.S</FilePath> - </File> - <File> - <FileName>backtrace.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath> - </File> - <File> - <FileName>div0.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\libcpu\arm\common\div0.c</FilePath> - </File> - <File> - <FileName>showmem.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\libcpu\arm\common\showmem.c</FilePath> - </File> - </Files> - </Group> - </Groups> - </Target> - </Targets> - -</Project> diff --git a/bsp/tm4c129x/template.uvproj b/bsp/tm4c129x/template.uvproj index 22d359c599..1a84ba0131 100644 --- a/bsp/tm4c129x/template.uvproj +++ b/bsp/tm4c129x/template.uvproj @@ -7,35 +7,38 @@ <Targets> <Target> - <TargetName>rt-thread_lm4f232</TargetName> + <TargetName>RT-Thread TM4C129X</TargetName> <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> <TargetOption> <TargetCommonOption> - <Device>LM4F232H5QD</Device> + <Device>TM4C129XNCZAD</Device> <Vendor>Texas Instruments</Vendor> - <Cpu>IRAM(0x20000000-0x20007FFF) IROM(0-0x3FFFF) CLOCK(16000000) CPUTYPE("Cortex-M4") FPU2</Cpu> + <PackID>Keil.TM4C_DFP.1.0.0</PackID> + <PackURL>http://www.keil.com/pack/</PackURL> + <Cpu>IROM(0x00000000,0x100000) IRAM(0x20000000,0x040000) CPUTYPE("Cortex-M4") FPU2 CLOCK(120000000) ELITTLE</Cpu> <FlashUtilSpec></FlashUtilSpec> - <StartupFile>"STARTUP\Luminary\Startup.s" ("Luminary Startup Code")</StartupFile> - <FlashDriverDll>UL2CM3(-O207 -S0 -C0 -FO7 -FD20000000 -FC800 -FN1 -FF0LM4F_256 -FS00 -FL040000)</FlashDriverDll> - <DeviceId>5931</DeviceId> - <RegisterFile>LM4Fxxxx.H</RegisterFile> + <StartupFile></StartupFile> + <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0TM4C129_1024 -FS00 -FL0100000 -FP0($$Device:TM4C129XNCZAD$Flash\TM4C129_1024.FLM))</FlashDriverDll> + <DeviceId>7096</DeviceId> + <RegisterFile>$$Device:TM4C129XNCZAD$Device\Include\TM4C129\TM4C129.h</RegisterFile> <MemoryEnv></MemoryEnv> <Cmp></Cmp> <Asm></Asm> <Linker></Linker> <OHString></OHString> <InfinionOptionDll></InfinionOptionDll> - <SLE66CMisc></SLE66CMisc> + <SLE66CMisc>-DTM4C129XNCZAD</SLE66CMisc> <SLE66AMisc></SLE66AMisc> <SLE66LinkerMisc></SLE66LinkerMisc> - <SFDFile>SFD\Luminary\LM4F232H5QD.SFR</SFDFile> + <SFDFile>$$Device:TM4C129XNCZAD$SVD\TM4C129\TM4C129XNCZAD.svd</SFDFile> + <bCustSvd>0</bCustSvd> <UseEnv>0</UseEnv> <BinPath></BinPath> <IncludePath></IncludePath> <LibPath></LibPath> - <RegisterFilePath>Luminary\</RegisterFilePath> - <DBRegisterFilePath>Luminary\</DBRegisterFilePath> + <RegisterFilePath></RegisterFilePath> + <DBRegisterFilePath></DBRegisterFilePath> <TargetStatus> <Error>0</Error> <ExitCodeStop>0</ExitCodeStop> @@ -44,13 +47,13 @@ <InvalidFlash>1</InvalidFlash> </TargetStatus> <OutputDirectory>.\build\</OutputDirectory> - <OutputName>project</OutputName> + <OutputName>rtthread-tm4c</OutputName> <CreateExecutable>1</CreateExecutable> <CreateLib>0</CreateLib> <CreateHexFile>0</CreateHexFile> <DebugInformation>1</DebugInformation> - <BrowseInformation>1</BrowseInformation> - <ListingPath>.\build\</ListingPath> + <BrowseInformation>0</BrowseInformation> + <ListingPath>.\</ListingPath> <HexFormatSelection>1</HexFormatSelection> <Merge32K>0</Merge32K> <CreateBatchFile>0</CreateBatchFile> @@ -61,6 +64,8 @@ <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> + <nStopU1X>0</nStopU1X> + <nStopU2X>0</nStopU2X> </BeforeCompile> <BeforeMake> <RunUserProg1>0</RunUserProg1> @@ -69,6 +74,8 @@ <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> + <nStopB1X>0</nStopB1X> + <nStopB2X>0</nStopB2X> </BeforeMake> <AfterMake> <RunUserProg1>0</RunUserProg1> @@ -95,6 +102,7 @@ <StopOnExitCode>3</StopOnExitCode> <CustomArgument></CustomArgument> <IncludeLibraryModules></IncludeLibraryModules> + <ComprImg>1</ComprImg> </CommonProperty> <DllOption> <SimDllName>SARMCM3.DLL</SimDllName> @@ -124,6 +132,7 @@ <RestoreFunctions>1</RestoreFunctions> <RestoreToolbox>1</RestoreToolbox> <LimitSpeedToRealTime>0</LimitSpeedToRealTime> + <RestoreSysVw>1</RestoreSysVw> </Simulator> <Target> <UseTarget>1</UseTarget> @@ -134,9 +143,12 @@ <RestoreMemoryDisplay>1</RestoreMemoryDisplay> <RestoreFunctions>0</RestoreFunctions> <RestoreToolbox>1</RestoreToolbox> + <RestoreTracepoints>1</RestoreTracepoints> + <RestoreSysVw>1</RestoreSysVw> + <UsePdscDebugDescription>1</UsePdscDebugDescription> </Target> <RunDebugAfterBuild>0</RunDebugAfterBuild> - <TargetSelection>4</TargetSelection> + <TargetSelection>3</TargetSelection> <SimDlls> <CpuDll></CpuDll> <CpuDllArguments></CpuDllArguments> @@ -158,13 +170,18 @@ <UseTargetDll>1</UseTargetDll> <UseExternalTool>0</UseExternalTool> <RunIndependent>0</RunIndependent> - <UpdateFlashBeforeDebugging>0</UpdateFlashBeforeDebugging> + <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging> <Capability>1</Capability> - <DriverSelection>4097</DriverSelection> + <DriverSelection>4096</DriverSelection> </Flash1> - <Flash2>BIN\lmidk-agdi.dll</Flash2> + <bUseTDR>1</bUseTDR> + <Flash2>BIN\UL2CM3.DLL</Flash2> <Flash3>"" ()</Flash3> <Flash4></Flash4> + <pFcarmOut></pFcarmOut> + <pFcarmGrp></pFcarmGrp> + <pFcArmRoot></pFcArmRoot> + <FcArmLst>0</FcArmLst> </Utilities> <TargetArmAds> <ArmAdsMisc> @@ -208,7 +225,7 @@ <hadIRAM2>0</hadIRAM2> <hadIROM2>0</hadIROM2> <StupSel>8</StupSel> - <useUlib>1</useUlib> + <useUlib>0</useUlib> <EndSel>0</EndSel> <uLtcg>0</uLtcg> <RoSelD>3</RoSelD> @@ -264,12 +281,12 @@ <IRAM> <Type>0</Type> <StartAddress>0x20000000</StartAddress> - <Size>0x8000</Size> + <Size>0x40000</Size> </IRAM> <IROM> <Type>1</Type> <StartAddress>0x0</StartAddress> - <Size>0x40000</Size> + <Size>0x100000</Size> </IROM> <XRAM> <Type>0</Type> @@ -294,7 +311,7 @@ <OCR_RVCT4> <Type>1</Type> <StartAddress>0x0</StartAddress> - <Size>0x40000</Size> + <Size>0x100000</Size> </OCR_RVCT4> <OCR_RVCT5> <Type>1</Type> @@ -319,7 +336,7 @@ <OCR_RVCT9> <Type>0</Type> <StartAddress>0x20000000</StartAddress> - <Size>0x8000</Size> + <Size>0x40000</Size> </OCR_RVCT9> <OCR_RVCT10> <Type>0</Type> @@ -334,14 +351,17 @@ <Optim>1</Optim> <oTime>0</oTime> <SplitLS>0</SplitLS> - <OneElfS>1</OneElfS> + <OneElfS>0</OneElfS> <Strict>0</Strict> <EnumInt>0</EnumInt> <PlainCh>0</PlainCh> <Ropi>0</Ropi> <Rwpi>0</Rwpi> - <wLevel>0</wLevel> + <wLevel>2</wLevel> <uThumb>0</uThumb> + <uSurpInc>0</uSurpInc> + <uC99>0</uC99> + <useXO>0</useXO> <VariousControls> <MiscControls></MiscControls> <Define></Define> @@ -357,6 +377,8 @@ <SplitLS>0</SplitLS> <SwStkChk>0</SwStkChk> <NoWarn>0</NoWarn> + <uSurpInc>0</uSurpInc> + <useXO>0</useXO> <VariousControls> <MiscControls></MiscControls> <Define></Define> @@ -372,8 +394,9 @@ <RepFail>1</RepFail> <useFile>0</useFile> <TextAddressRange>0x00000000</TextAddressRange> - <DataAddressRange>0x20000000</DataAddressRange> - <ScatterFile></ScatterFile> + <DataAddressRange>0x00000000</DataAddressRange> + <pXoBase></pXoBase> + <ScatterFile>tm4c_rom.sct</ScatterFile> <IncludeLibs></IncludeLibs> <IncludeLibsPath></IncludeLibsPath> <Misc></Misc> |
