@@ -33,120 +33,150 @@ zephyr_compile_definitions_ifdef(CONFIG_NXP_RW610
33
33
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW_rw610.h"
34
34
)
35
35
36
- zephyr_compile_definitions_ifdef (CONFIG_88W8987_AW_CM358_USD
36
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8987_AW_CM358_USD
37
37
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW.h"
38
38
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x09
39
39
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
40
40
WIFI_BT_USE_USD_INTERFACE
41
41
)
42
42
43
- zephyr_compile_definitions_ifdef (CONFIG_88W8987_AW_CM358MA_M2
43
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8987_AW_CM358MA_M2
44
44
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW.h"
45
45
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x09
46
46
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
47
47
WIFI_BT_USE_M2_INTERFACE
48
48
)
49
49
50
- zephyr_compile_definitions_ifdef (CONFIG_88W8987_MURATA_1ZM_USD
50
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8987_MURATA_1ZM_USD
51
51
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1ZM_WW.h"
52
52
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x06
53
53
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x06
54
54
WIFI_BT_USE_USD_INTERFACE
55
55
)
56
56
57
- zephyr_compile_definitions_ifdef (CONFIG_88W8987_MURATA_1ZM_M2
57
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8987_MURATA_1ZM_M2
58
58
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1ZM_WW.h"
59
59
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x06
60
60
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x06
61
61
WIFI_BT_USE_M2_INTERFACE
62
62
)
63
63
64
- zephyr_compile_definitions_ifdef (CONFIG_IW416_AW_AM457_USD
65
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW.h"
64
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_AW_AM457_USD
66
65
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x09
67
66
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
68
67
WIFI_BT_USE_USD_INTERFACE
69
68
)
70
69
71
- zephyr_compile_definitions_ifdef (CONFIG_IW416_AW_AM457MA_M2
72
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW.h"
70
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_AW_AM457MA_M2
73
71
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x09
74
72
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
75
73
WIFI_BT_USE_M2_INTERFACE
76
74
)
77
75
78
- zephyr_compile_definitions_ifdef (CONFIG_IW416_AW_AM510_USD
79
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW.h"
76
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_AW_AM510_USD
80
77
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x09
81
78
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
82
79
WIFI_BT_USE_USD_INTERFACE
83
80
)
84
81
85
- zephyr_compile_definitions_ifdef (CONFIG_IW416_AW_AM510MA_M2
86
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_WW.h"
82
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_AW_AM510MA_M2
87
83
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x09
88
84
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
89
85
WIFI_BT_USE_M2_INTERFACE
90
86
)
91
87
92
- zephyr_compile_definitions_ifdef (CONFIG_IW416_MURATA_1XK_USD
93
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_WW.h"
88
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_MURATA_1XK_USD
94
89
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x00
95
90
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
96
91
WIFI_BT_USE_USD_INTERFACE
97
92
)
98
93
99
- zephyr_compile_definitions_ifdef (CONFIG_IW416_MURATA_1XK_M2
100
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_WW.h"
94
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_MURATA_1XK_M2
101
95
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x00
102
96
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0C
103
97
WIFI_BT_USE_M2_INTERFACE
104
98
)
105
99
106
- zephyr_compile_definitions_ifdef (CONFIG_IW612_MURATA_2EL_USD
107
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_WW.h"
100
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_REGION_EU
101
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_EU.h"
102
+ )
103
+
104
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_REGION_CA
105
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_CA.h"
106
+ )
107
+
108
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_REGION_WW
109
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_WW.h"
110
+ )
111
+
112
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_REGION_US
113
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_US.h"
114
+ )
115
+
116
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_REGION_JP
117
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_JP.h"
118
+ )
119
+
120
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW416_REGION_CA
121
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_1XK_CA.h"
122
+ )
123
+
124
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW612_MURATA_2EL_USD
108
125
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0A
109
126
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0A
110
127
WIFI_BT_USE_USD_INTERFACE
111
128
)
112
129
113
- zephyr_compile_definitions_ifdef (CONFIG_IW612_MURATA_2EL_M2
114
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_WW.h"
130
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW612_MURATA_2EL_M2
115
131
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0A
116
132
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0A
117
133
WIFI_BT_USE_M2_INTERFACE
118
134
)
119
135
120
- zephyr_compile_definitions_ifdef (CONFIG_IW611_MURATA_2DL_USD
121
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_WW.h"
136
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW611_MURATA_2DL_USD
122
137
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0A
123
138
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0A
124
139
WIFI_BT_USE_USD_INTERFACE
125
140
)
126
141
127
- zephyr_compile_definitions_ifdef (CONFIG_IW611_MURATA_2DL_M2
128
- WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_WW.h"
142
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW611_MURATA_2DL_M2
129
143
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0A
130
144
CONFIG_NXP_WIFI_ED_OFFSET_5G=0x0A
131
145
WIFI_BT_USE_M2_INTERFACE
132
146
)
133
147
134
- zephyr_compile_definitions_ifdef (CONFIG_88W8801_AW_NM191_USD
148
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW61X_REGION_US
149
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_US_RU_Tx_power.h"
150
+ )
151
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW61X_REGION_JP
152
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_JP_RU_Tx_power.h"
153
+ )
154
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW61X_REGION_CA
155
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_CA_RU_Tx_power.h"
156
+ )
157
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW61X_REGION_EU
158
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_EU_RU_Tx_power.h"
159
+ )
160
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_IW61X_REGION_WW
161
+ WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2EL_WW.h"
162
+ )
163
+
164
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8801_AW_NM191_USD
135
165
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW.h"
136
166
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x1B
137
167
)
138
168
139
- zephyr_compile_definitions_ifdef (CONFIG_88W8801_AW_NM191MA_M2
169
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8801_AW_NM191MA_M2
140
170
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_WW.h"
141
171
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x1B
142
172
)
143
173
144
- zephyr_compile_definitions_ifdef (CONFIG_88W8801_MURATA_2DS_USD
174
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8801_MURATA_2DS_USD
145
175
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2DS_WW.h"
146
176
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0E
147
177
)
148
178
149
- zephyr_compile_definitions_ifdef (CONFIG_88W8801_MURATA_2DS_M2
179
+ zephyr_compile_definitions_ifdef (CONFIG_NXP_88W8801_MURATA_2DS_M2
150
180
WIFI_BT_TX_PWR_LIMITS= "wlan_txpwrlimit_cfg_murata_2DS_WW.h"
151
181
CONFIG_NXP_WIFI_ED_OFFSET_2G=0x0E
152
182
)
@@ -263,6 +293,13 @@ zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
263
293
264
294
if (CONFIG_CODE_DATA_RELOCATION )
265
295
if (CONFIG_SPEED_OPTIMIZATIONS OR CONFIG_SIZE_OPTIMIZATIONS )
296
+
297
+ if (CONFIG_NXP_RW610 )
298
+ set (QUICK_ACCESS_CODE_AREA RAM_TEXT )
299
+ else ()
300
+ set (QUICK_ACCESS_CODE_AREA ITCM_TEXT )
301
+ endif ()
302
+
266
303
# critical path code relocated to SRAM
267
304
zephyr_code_relocate (FILES
268
305
port/osa/osa.c
@@ -273,13 +310,13 @@ zephyr_code_relocate(FILES
273
310
wifidriver/mlan_11n_rxreorder.c
274
311
wifidriver/mlan_wmm.c
275
312
wifidriver/wifi.c
276
- LOCATION RAM_TEXT )
313
+ LOCATION ${QUICK_ACCESS_CODE_AREA} )
277
314
278
315
if (CONFIG_SDIO_STACK )
279
316
zephyr_code_relocate (FILES
280
317
sdio_nxp_abs/mlan_sdio.c
281
318
wifidriver/wifi-sdio.c
282
- LOCATION RAM_TEXT )
319
+ LOCATION ${QUICK_ACCESS_CODE_AREA} )
283
320
endif ()
284
321
285
322
if (CONFIG_NXP_RW610 )
@@ -292,41 +329,44 @@ endif()
292
329
293
330
zephyr_code_relocate (FILES
294
331
${MCUX_SDK_DIR} /components/osa/fsl_os_abstraction_zephyr.c
295
- LOCATION RAM_TEXT )
332
+ LOCATION ${QUICK_ACCESS_CODE_AREA} )
296
333
297
334
if (DEFINED CONFIG_SOC_SDKNG_UNSUPPORTED )
298
335
zephyr_code_relocate (FILES
299
336
${ZEPHYR_HAL_NXP_MODULE_DIR} /mcux/mcux-sdk/utilities/misc_utilities/fsl_memcpy.S
300
- LOCATION RAM_TEXT )
337
+ LOCATION ${QUICK_ACCESS_CODE_AREA} )
301
338
else ()
302
339
zephyr_code_relocate (FILES
303
340
${ZEPHYR_HAL_NXP_MODULE_DIR} /mcux/mcux-sdk-ng/components/misc_utilities/fsl_memcpy.S
304
- LOCATION RAM_TEXT )
341
+ LOCATION ${QUICK_ACCESS_CODE_AREA} )
305
342
endif ()
306
343
307
344
file (GLOB ZPERF_SRC ${ZEPHYR_BASE} /subsys/net/lib/zperf/*.c )
308
345
zephyr_code_relocate (FILES ${ZPERF_SRC} LOCATION RAM_TEXT )
309
346
347
+ zephyr_code_relocate (FILES
348
+ ${ZEPHYR_BASE} /subsys/net/ip/connection.c
349
+ ${ZEPHYR_BASE} /subsys/net/ip/ipv6.c
350
+ ${ZEPHYR_BASE} /subsys/net/ip/ipv6_fragment.c
351
+ ${ZEPHYR_BASE} /subsys/net/ip/packet_socket.c
352
+ ${ZEPHYR_BASE} /subsys/net/ip/utils.c
353
+ LOCATION RAM_TEXT )
354
+
310
355
zephyr_code_relocate (FILES
311
356
${ZEPHYR_BASE} /subsys/net/lib/sockets/sockets_packet.c
312
357
${ZEPHYR_BASE} /subsys/net/lib/sockets/sockets.c
313
- ${ZEPHYR_BASE} /subsys/net/ip/connection.c
314
358
${ZEPHYR_BASE} /subsys/net/ip/ipv4.c
315
359
${ZEPHYR_BASE} /subsys/net/ip/ipv4_fragment.c
316
- ${ZEPHYR_BASE} /subsys/net/ip/ipv6.c
317
- ${ZEPHYR_BASE} /subsys/net/ip/ipv6_fragment.c
318
360
${ZEPHYR_BASE} /subsys/net/ip/net_context.c
319
361
${ZEPHYR_BASE} /subsys/net/ip/net_core.c
320
362
${ZEPHYR_BASE} /subsys/net/ip/net_if.c
321
363
${ZEPHYR_BASE} /subsys/net/ip/net_pkt.c
322
364
${ZEPHYR_BASE} /subsys/net/ip/net_tc.c
323
- ${ZEPHYR_BASE} /subsys/net/ip/packet_socket.c
324
365
${ZEPHYR_BASE} /subsys/net/ip/tcp.c
325
366
${ZEPHYR_BASE} /subsys/net/ip/udp.c
326
- ${ZEPHYR_BASE} /subsys/net/ip/utils.c
327
367
${ZEPHYR_BASE} /subsys/net/l2/ethernet/ethernet.c
328
368
${ZEPHYR_BASE} /lib/net_buf/buf.c
329
- LOCATION RAM_TEXT )
369
+ LOCATION ${QUICK_ACCESS_CODE_AREA} )
330
370
331
371
zephyr_code_relocate (FILES
332
372
${ZEPHYR_BASE} /kernel/mem_slab.c
@@ -338,7 +378,7 @@ zephyr_code_relocate(FILES
338
378
${ZEPHYR_BASE} /kernel/sem.c
339
379
${ZEPHYR_BASE} /kernel/thread.c
340
380
${ZEPHYR_BASE} /kernel/work.c
341
- LOCATION RAM_TEXT )
381
+ LOCATION ${QUICK_ACCESS_CODE_AREA} )
342
382
endif ()
343
383
endif ()
344
384
0 commit comments