Skip to content

Commit e71521a

Browse files
nockonocko
committed
Add nRF52 and DK to wizards and use startup-gen
1 parent ebd004e commit e71521a

23 files changed

+456
-22352
lines changed

‎boards/MicroBit/microbit_zfp.gpr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ library project MicroBit_ZFP is
143143
Src_Dirs_Root & "/arch/ARM/cortex_m/src/nocache", -- From arch definition
144144
Src_Dirs_Root & "/arch/ARM/cortex_m/src/nvic_cm0", -- From arch definition
145145
Src_Dirs_Root & "/arch/ARM/Nordic/devices/nrf51", -- From MCU definition
146-
Src_Dirs_Root & "/arch/ARM/Nordic/drivers/nrf51", -- From MCU definition
147146
Src_Dirs_Root & "/arch/ARM/Nordic/drivers/nrf_common", -- From MCU definition
147+
Src_Dirs_Root & "/arch/ARM/Nordic/drivers/nrf51", -- From MCU definition
148148
Src_Dirs_Root & "/arch/ARM/Nordic/svd/nrf51/", -- From MCU definition
149149
Src_Dirs_Root & "/middleware/src/filesystem", -- From middleware config
150150
Src_Dirs_Root & "/middleware/src/BLE", -- From middleware config

‎boards/NRF52_DK/nrf52_dk_zfp.gpr‎

Lines changed: 107 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,10 @@ library project NRF52_DK_ZFP is
5050
"-gnatw.X", -- Disable warnings for No_Exception_Propagation
5151
"-ffunction-sections", -- Create a linker section for each function
5252
"-fdata-sections"); -- Create a linker section for each data
53-
54-
for Default_Switches ("C") use Compiler'Default_Switches ("C") &
55-
("-DNRF52832_XXAA");
56-
5753
end Compiler;
5854

5955

60-
for Languages use ("Ada", "Asm_CPP", "C");
56+
for Languages use ("Ada", "Asm_CPP");
6157
for Create_Missing_Dirs use "True";
6258
for Object_Dir use "obj/zfp_" & Build;
6359
for Library_Dir use "obj/zfp_lib_" & Build;
@@ -69,8 +65,8 @@ library project NRF52_DK_ZFP is
6965
for Runtime ("Ada") use "zfp-cortex-m4f";
7066

7167
package Device_Configuration is
72-
for CPU_Name use "ARM Cortex-M0";
73-
for Number_Of_Interrupts use "32";
68+
for CPU_Name use "ARM Cortex-M4F";
69+
for Number_Of_Interrupts use "128";
7470
for Interrupt ("0") use "adl_irq";
7571
for Interrupt ("1") use "adl_irq";
7672
for Interrupt ("2") use "adl_irq";
@@ -103,6 +99,102 @@ library project NRF52_DK_ZFP is
10399
for Interrupt ("29") use "adl_irq";
104100
for Interrupt ("30") use "adl_irq";
105101
for Interrupt ("31") use "adl_irq";
102+
for Interrupt ("32") use "adl_irq";
103+
for Interrupt ("33") use "adl_irq";
104+
for Interrupt ("34") use "adl_irq";
105+
for Interrupt ("35") use "adl_irq";
106+
for Interrupt ("36") use "adl_irq";
107+
for Interrupt ("37") use "adl_irq";
108+
for Interrupt ("38") use "adl_irq";
109+
for Interrupt ("39") use "adl_irq";
110+
for Interrupt ("40") use "adl_irq";
111+
for Interrupt ("41") use "adl_irq";
112+
for Interrupt ("42") use "adl_irq";
113+
for Interrupt ("43") use "adl_irq";
114+
for Interrupt ("44") use "adl_irq";
115+
for Interrupt ("45") use "adl_irq";
116+
for Interrupt ("46") use "adl_irq";
117+
for Interrupt ("47") use "adl_irq";
118+
for Interrupt ("48") use "adl_irq";
119+
for Interrupt ("49") use "adl_irq";
120+
for Interrupt ("50") use "adl_irq";
121+
for Interrupt ("51") use "adl_irq";
122+
for Interrupt ("52") use "adl_irq";
123+
for Interrupt ("53") use "adl_irq";
124+
for Interrupt ("54") use "adl_irq";
125+
for Interrupt ("55") use "adl_irq";
126+
for Interrupt ("56") use "adl_irq";
127+
for Interrupt ("57") use "adl_irq";
128+
for Interrupt ("58") use "adl_irq";
129+
for Interrupt ("59") use "adl_irq";
130+
for Interrupt ("60") use "adl_irq";
131+
for Interrupt ("61") use "adl_irq";
132+
for Interrupt ("62") use "adl_irq";
133+
for Interrupt ("63") use "adl_irq";
134+
for Interrupt ("64") use "adl_irq";
135+
for Interrupt ("65") use "adl_irq";
136+
for Interrupt ("66") use "adl_irq";
137+
for Interrupt ("67") use "adl_irq";
138+
for Interrupt ("68") use "adl_irq";
139+
for Interrupt ("69") use "adl_irq";
140+
for Interrupt ("70") use "adl_irq";
141+
for Interrupt ("71") use "adl_irq";
142+
for Interrupt ("72") use "adl_irq";
143+
for Interrupt ("73") use "adl_irq";
144+
for Interrupt ("74") use "adl_irq";
145+
for Interrupt ("75") use "adl_irq";
146+
for Interrupt ("76") use "adl_irq";
147+
for Interrupt ("77") use "adl_irq";
148+
for Interrupt ("78") use "adl_irq";
149+
for Interrupt ("79") use "adl_irq";
150+
for Interrupt ("80") use "adl_irq";
151+
for Interrupt ("81") use "adl_irq";
152+
for Interrupt ("82") use "adl_irq";
153+
for Interrupt ("83") use "adl_irq";
154+
for Interrupt ("84") use "adl_irq";
155+
for Interrupt ("85") use "adl_irq";
156+
for Interrupt ("86") use "adl_irq";
157+
for Interrupt ("87") use "adl_irq";
158+
for Interrupt ("88") use "adl_irq";
159+
for Interrupt ("89") use "adl_irq";
160+
for Interrupt ("90") use "adl_irq";
161+
for Interrupt ("91") use "adl_irq";
162+
for Interrupt ("92") use "adl_irq";
163+
for Interrupt ("93") use "adl_irq";
164+
for Interrupt ("94") use "adl_irq";
165+
for Interrupt ("95") use "adl_irq";
166+
for Interrupt ("96") use "adl_irq";
167+
for Interrupt ("97") use "adl_irq";
168+
for Interrupt ("98") use "adl_irq";
169+
for Interrupt ("99") use "adl_irq";
170+
for Interrupt ("100") use "adl_irq";
171+
for Interrupt ("101") use "adl_irq";
172+
for Interrupt ("102") use "adl_irq";
173+
for Interrupt ("103") use "adl_irq";
174+
for Interrupt ("104") use "adl_irq";
175+
for Interrupt ("105") use "adl_irq";
176+
for Interrupt ("106") use "adl_irq";
177+
for Interrupt ("107") use "adl_irq";
178+
for Interrupt ("108") use "adl_irq";
179+
for Interrupt ("109") use "adl_irq";
180+
for Interrupt ("110") use "adl_irq";
181+
for Interrupt ("111") use "adl_irq";
182+
for Interrupt ("112") use "adl_irq";
183+
for Interrupt ("113") use "adl_irq";
184+
for Interrupt ("114") use "adl_irq";
185+
for Interrupt ("115") use "adl_irq";
186+
for Interrupt ("116") use "adl_irq";
187+
for Interrupt ("117") use "adl_irq";
188+
for Interrupt ("118") use "adl_irq";
189+
for Interrupt ("119") use "adl_irq";
190+
for Interrupt ("120") use "adl_irq";
191+
for Interrupt ("121") use "adl_irq";
192+
for Interrupt ("122") use "adl_irq";
193+
for Interrupt ("123") use "adl_irq";
194+
for Interrupt ("124") use "adl_irq";
195+
for Interrupt ("125") use "adl_irq";
196+
for Interrupt ("126") use "adl_irq";
197+
for Interrupt ("127") use "adl_irq";
106198

107199
for Memories use ("flash", "ram");
108200

@@ -125,16 +217,16 @@ library project NRF52_DK_ZFP is
125217
Device_Name := "nRF52832xxAA"; -- From board definition
126218
Device_Family := "nRF52"; -- From board definition
127219
Has_Ravenscar_SFP_Runtime := "False"; -- From board definition
128-
Runtime_Name := "zfp-cortex-m4f"; -- From default value
220+
Runtime_Name := "zfp-cortex-m4f"; -- From default value
129221
Has_Ravenscar_Full_Runtime := "False"; -- From board definition
130-
CPU_Core := "ARM Cortex-M4F"; -- From mcu definition
222+
CPU_Core := "ARM Cortex-M4F"; -- From mcu definition
131223
Board := "NRF52_DK"; -- From command line
132224
Has_ZFP_Runtime := "True"; -- From board definition
133-
Number_Of_Interrupts := "32"; -- From MCU definition
225+
Number_Of_Interrupts := "128"; -- From MCU definition
134226
Has_Custom_Memory_Area_1 := "False"; -- From default value
135-
Use_Startup_Gen := "False"; -- From command line
227+
Use_Startup_Gen := "True"; -- From command line
136228
Max_Path_Length := "1024"; -- From default value
137-
Runtime_Name_Suffix := "cortex-m4f"; -- From board definition
229+
Runtime_Name_Suffix := "cortex-m4f"; -- From board definition
138230
Architecture := "ARM"; -- From board definition
139231

140232
-- Project source directories
@@ -144,12 +236,13 @@ library project NRF52_DK_ZFP is
144236
Src_Dirs_Root & "/boards/NRF52_DK/src/", -- From board definition
145237
Src_Dirs_Root & "/arch/ARM/cortex_m/src", -- From arch definition
146238
Src_Dirs_Root & "/arch/ARM/cortex_m/src/cm4f", -- From arch definition
239+
Src_Dirs_Root & "/arch/ARM/cortex_m/src/fpu", -- From arch definition
147240
Src_Dirs_Root & "/arch/ARM/cortex_m/src/nocache", -- From arch definition
148241
Src_Dirs_Root & "/arch/ARM/cortex_m/src/nvic_cm4_cm7", -- From arch definition
149242
Src_Dirs_Root & "/arch/ARM/Nordic/devices/nrf52", -- From MCU definition
150-
Src_Dirs_Root & "/arch/ARM/Nordic/drivers/nrf52", -- From MCU definition
151243
Src_Dirs_Root & "/arch/ARM/Nordic/drivers/nrf_common", -- From MCU definition
152-
Src_Dirs_Root & "/arch/ARM/Nordic/svd/nrf52", -- From MCU definition
244+
Src_Dirs_Root & "/arch/ARM/Nordic/drivers/nrf52", -- From MCU definition
245+
Src_Dirs_Root & "/arch/ARM/Nordic/svd/nrf52/", -- From MCU definition
153246
Src_Dirs_Root & "/middleware/src/filesystem", -- From middleware config
154247
Src_Dirs_Root & "/middleware/src/BLE", -- From middleware config
155248
Src_Dirs_Root & "/middleware/src/utils", -- From middleware config

‎boards/NRF52_DK/src/zfp/adl_config.ads‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ package ADL_Config is
88
Device_Name : constant String := "nRF52832xxAA"; -- From board definition
99
Device_Family : constant String := "nRF52"; -- From board definition
1010
Has_Ravenscar_SFP_Runtime : constant String := "False"; -- From board definition
11-
Runtime_Name : constant String := "zfp-cortex-m4"; -- From default value
11+
Runtime_Name : constant String := "zfp-cortex-m4f"; -- From default value
1212
Has_Ravenscar_Full_Runtime : constant String := "False"; -- From board definition
13-
CPU_Core : constant String := "ARM Cortex-M4"; -- From mcu definition
13+
CPU_Core : constant String := "ARM Cortex-M4F"; -- From mcu definition
1414
Board : constant String := "NRF52_DK"; -- From command line
1515
Has_ZFP_Runtime : constant String := "True"; -- From board definition
16-
Number_Of_Interrupts : constant := 32; -- From MCU definition
16+
Number_Of_Interrupts : constant := 128; -- From MCU definition
1717
Has_Custom_Memory_Area_1 : constant Boolean := False; -- From default value
1818
Use_Startup_Gen : constant Boolean := True; -- From command line
1919
Max_Path_Length : constant := 1024; -- From default value
20-
Runtime_Name_Suffix : constant String := "cortex-m4"; -- From board definition
20+
Runtime_Name_Suffix : constant String := "cortex-m4f"; -- From board definition
2121
Architecture : constant String := "ARM"; -- From board definition
2222
end ADL_Config;

0 commit comments

Comments
 (0)