Skip to content

Commit

Permalink
Merge pull request #220 from ingchips/develop
Browse files Browse the repository at this point in the history 
update:
  • Loading branch information
@zjli-2019
zjli-2019 authored Sep 26, 2023
2 parents 71b2e44 + 147f6f0 commit 07640c0
Show file tree
Hide file tree
Showing 14 changed files with 776 additions and 789 deletions.
672 changes: 336 additions & 336 deletions bundles/mini/ING9168xx/apis.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions bundles/mini/ING9168xx/meta.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
},
"ram": {
"base": 536870912,
"size": 28948
"size": 28932
},
"rom": {
"base": 33562624,
"size": 155548
"size": 155544
},
"version": [
2,
2,
47
48
]
}
Binary file modified bundles/mini/ING9168xx/platform.bin
View file
Binary file not shown.
516 changes: 258 additions & 258 deletions bundles/noos_mini/ING9168xx/apis.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions bundles/noos_mini/ING9168xx/meta.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
},
"ram": {
"base": 536870912,
"size": 16956
"size": 16940
},
"rom": {
"base": 33562624,
"size": 144652
"size": 144648
},
"version": [
2,
2,
47
48
]
}
Binary file modified bundles/noos_mini/ING9168xx/platform.bin
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions examples-iar/peripheral_ibeacon/generic_cortex.icf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*-Editor annotation file-*/
/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_4.xml" */
/*-Specials-*/
define symbol __ICFEDIT_intvec_start__ = 155648;
define symbol __ICFEDIT_intvec_start__ = 155648;
/*-Memory Regions-*/
define symbol __ICFEDIT_region_IROM1_start__ = 155648;
define symbol __ICFEDIT_region_IROM1_start__ = 155648;
define symbol __ICFEDIT_region_IROM1_end__ = 0x00084000;
define symbol __ICFEDIT_region_IROM2_start__ = 0x0;
define symbol __ICFEDIT_region_IROM2_end__ = 0x0;
Expand All @@ -14,7 +14,7 @@ define symbol __ICFEDIT_region_EROM2_start__ = 0x0;
define symbol __ICFEDIT_region_EROM2_end__ = 0x0;
define symbol __ICFEDIT_region_EROM3_start__ = 0x0;
define symbol __ICFEDIT_region_EROM3_end__ = 0x0;
define symbol __ICFEDIT_region_IRAM1_start__ = 536900792;
define symbol __ICFEDIT_region_IRAM1_start__ = 536900792;
define symbol __ICFEDIT_region_IRAM1_end__ = 0x2000FFFF;
define symbol __ICFEDIT_region_IRAM2_start__ = 0x0;
define symbol __ICFEDIT_region_IRAM2_end__ = 0x0;
Expand Down
116 changes: 56 additions & 60 deletions examples/bqb_rf/bqb_rf.uvproj
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<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>
Expand All @@ -15,27 +12,27 @@
<Device>ing91600</Device>
<Vendor>INGCHIPS</Vendor>
<Cpu>CLOCK(128000000) CPUTYPE("Cortex-M4") FPU2 ELITTLE IROM(0x2000000-0x21fffff) IRAM(0x20000000-0x20007fff)</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
<FlashDriverDll></FlashDriverDll>
<FlashUtilSpec/>
<StartupFile/>
<FlashDriverDll/>
<DeviceId>0</DeviceId>
<RegisterFile></RegisterFile>
<MemoryEnv></MemoryEnv>
<Cmp></Cmp>
<Asm></Asm>
<Linker></Linker>
<OHString></OHString>
<InfinionOptionDll></InfinionOptionDll>
<SLE66CMisc></SLE66CMisc>
<SLE66AMisc></SLE66AMisc>
<SLE66LinkerMisc></SLE66LinkerMisc>
<SFDFile></SFDFile>
<RegisterFile/>
<MemoryEnv/>
<Cmp/>
<Asm/>
<Linker/>
<OHString/>
<InfinionOptionDll/>
<SLE66CMisc/>
<SLE66AMisc/>
<SLE66LinkerMisc/>
<SFDFile/>
<UseEnv>0</UseEnv>
<BinPath></BinPath>
<IncludePath></IncludePath>
<LibPath></LibPath>
<RegisterFilePath></RegisterFilePath>
<DBRegisterFilePath></DBRegisterFilePath>
<BinPath/>
<IncludePath/>
<LibPath/>
<RegisterFilePath/>
<DBRegisterFilePath/>
<TargetStatus>
<Error>0</Error>
<ExitCodeStop>0</ExitCodeStop>
Expand All @@ -57,8 +54,8 @@
<BeforeCompile>
<RunUserProg1>0</RunUserProg1>
<RunUserProg2>0</RunUserProg2>
<UserProg1Name></UserProg1Name>
<UserProg2Name></UserProg2Name>
<UserProg1Name/>
<UserProg2Name/>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
<nStopU1X>0</nStopU1X>
Expand All @@ -67,21 +64,21 @@
<BeforeMake>
<RunUserProg1>0</RunUserProg1>
<RunUserProg2>0</RunUserProg2>
<UserProg1Name></UserProg1Name>
<UserProg2Name></UserProg2Name>
<UserProg1Name/>
<UserProg2Name/>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
</BeforeMake>
<AfterMake>
<RunUserProg1>1</RunUserProg1>
<RunUserProg2>0</RunUserProg2>
<UserProg1Name>fromelf.exe --bin -o bqb_rf.bin ./output/bqb_rf.axf</UserProg1Name>
<UserProg2Name></UserProg2Name>
<UserProg2Name/>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
</AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild>
<SVCSIdString></SVCSIdString>
<SVCSIdString/>
</TargetCommonOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
Expand All @@ -95,16 +92,16 @@
<AssembleAssemblyFile>0</AssembleAssemblyFile>
<PublicsOnly>0</PublicsOnly>
<StopOnExitCode>3</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<CustomArgument/>
<IncludeLibraryModules/>
</CommonProperty>
<DllOption>
<SimDllName>SARMCM3.DLL</SimDllName>
<SimDllArguments></SimDllArguments>
<SimDllArguments/>
<SimDlgDll>DCM.DLL</SimDlgDll>
<SimDlgDllArguments>-pCM3</SimDlgDllArguments>
<TargetDllName>SARMCM3.DLL</TargetDllName>
<TargetDllArguments></TargetDllArguments>
<TargetDllArguments/>
<TargetDlgDll>TCM.DLL</TargetDlgDll>
<TargetDlgDllArguments>-pCM3</TargetDlgDllArguments>
</DllOption>
Expand Down Expand Up @@ -141,17 +138,17 @@
<RunDebugAfterBuild>0</RunDebugAfterBuild>
<TargetSelection>7</TargetSelection>
<SimDlls>
<CpuDll></CpuDll>
<CpuDllArguments></CpuDllArguments>
<PeripheralDll></PeripheralDll>
<PeripheralDllArguments></PeripheralDllArguments>
<CpuDll/>
<CpuDllArguments/>
<PeripheralDll/>
<PeripheralDllArguments/>
<InitializationFile>..\map.ini</InitializationFile>
</SimDlls>
<TargetDlls>
<CpuDll></CpuDll>
<CpuDllArguments></CpuDllArguments>
<PeripheralDll></PeripheralDll>
<PeripheralDllArguments></PeripheralDllArguments>
<CpuDll/>
<CpuDllArguments/>
<PeripheralDll/>
<PeripheralDllArguments/>
<InitializationFile>.\init.ini</InitializationFile>
<Driver>Segger\JL2CM3.dll</Driver>
</TargetDlls>
Expand All @@ -168,7 +165,7 @@
<bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3>"" ()</Flash3>
<Flash4></Flash4>
<Flash4/>
</Utilities>
<TargetArmAds>
<ArmAdsMisc>
Expand Down Expand Up @@ -200,7 +197,7 @@
<RvctClst>0</RvctClst>
<GenPPlst>0</GenPPlst>
<AdsCpuType>"Cortex-M4"</AdsCpuType>
<RvctDeviceName></RvctDeviceName>
<RvctDeviceName/>
<mOS>0</mOS>
<uocRom>0</uocRom>
<uocRam>0</uocRam>
Expand Down Expand Up @@ -297,8 +294,8 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>1</Type>
<StartAddress>0x202a000</StartAddress>
<Size>0x56000</Size>
<StartAddress>33726464</StartAddress>
<Size>352256</Size>
</OCR_RVCT4>
<OCR_RVCT5>
<Type>1</Type>
Expand All @@ -322,16 +319,16 @@
</OCR_RVCT8>
<OCR_RVCT9>
<Type>0</Type>
<StartAddress>0x20005450</StartAddress>
<Size>0x2bb0</Size>
<StartAddress>536892496</StartAddress>
<Size>11184</Size>
</OCR_RVCT9>
<OCR_RVCT10>
<Type>0</Type>
<StartAddress>0x0</StartAddress>
<Size>0x0</Size>
</OCR_RVCT10>
</OnChipMemories>
<RvctStartVector></RvctStartVector>
<RvctStartVector/>
</ArmAdsMisc>
<Cads>
<interw>1</interw>
Expand All @@ -350,7 +347,7 @@
<VariousControls>
<MiscControls>--gnu</MiscControls>
<Define>USE_STDPERIPH_DRIVER</Define>
<Undefine></Undefine>
<Undefine/>
<IncludePath>../../bundles/extension/inc;../../bundles/extension/inc/os;../../src/BSP;../../src/FWlib;../../src/StartUP/ing916;../../src/Tools;../../src</IncludePath>
</VariousControls>
</Cads>
Expand All @@ -364,10 +361,10 @@
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
<MiscControls/>
<Define/>
<Undefine/>
<IncludePath/>
</VariousControls>
</Aads>
<LDads>
Expand All @@ -379,12 +376,12 @@
<useFile>0</useFile>
<TextAddressRange>0x00000000</TextAddressRange>
<DataAddressRange>0x00000000</DataAddressRange>
<ScatterFile></ScatterFile>
<IncludeLibs></IncludeLibs>
<IncludeLibsPath></IncludeLibsPath>
<Misc></Misc>
<LinkerInputFile></LinkerInputFile>
<DisabledWarnings></DisabledWarnings>
<ScatterFile/>
<IncludeLibs/>
<IncludeLibsPath/>
<Misc/>
<LinkerInputFile/>
<DisabledWarnings/>
</LDads>
</TargetArmAds>
</TargetOption>
Expand Down Expand Up @@ -477,5 +474,4 @@
</Groups>
</Target>
</Targets>

</Project>
Loading

0 comments on commit 07640c0

Please sign in to comment.