Skip to content

Commit c99f456

Browse files
khoa-nguyen-18kartben
khoa-nguyen-18
authored and
kartben
committed
modules: hal_ethos_u: Update ARM_ETHOS_U config
- Update to use ETHOS_U config instead of ARM_ETHOS_U - Update prefix ETHOS_U_ for all configs that use ARM_ETHOS_U_ Signed-off-by: Khoa Nguyen <[email protected]>
1 parent 42b2624 commit c99f456

File tree

4 files changed

+56
-53
lines changed

4 files changed

+56
-53
lines changed

‎doc/releases/migration-guide-4.2.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,9 @@ Misc
409409
* All memc_flexram_* namespaced things including kconfigs and C API
410410
have been changed to just flexram_*.
411411

412+
* Select ``CONFIG_ETHOS_U`` instead ``CONFIG_ARM_ETHOS_U`` to enable Ethos-U NPU driver.
413+
* Rename all configs that have prefix ``CONFIG_ARM_ETHOS_U_`` to ``CONFIG_ETHOS_U_``.
414+
412415
Bluetooth
413416
*********
414417

‎modules/hal_ethos_u/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
# affiliates <[email protected]></text>
33
# SPDX-License-Identifier: Apache-2.0
44

5-
if(CONFIG_ARM_ETHOS_U AND CONFIG_MULTITHREADING)
5+
if(CONFIG_ETHOS_U AND CONFIG_MULTITHREADING)
66
# Due to CMP0126 not being NEW, ETHOSU_TARGET_NPU_CONFIG originally
77
# as directory variable will fail to override that in ethos-u-core-driver
88
# as cache variable. Fix by passing as cache variable. See:
99
# https://cmake.org/cmake/help/latest/policy/CMP0126.html#policy:CMP0126
10-
set(ETHOSU_TARGET_NPU_CONFIG ${CONFIG_ARM_ETHOS_U_NPU_NAME} CACHE STRING "NPU configuration")
10+
set(ETHOSU_TARGET_NPU_CONFIG ${CONFIG_ETHOS_U_NPU_NAME} CACHE STRING "NPU configuration")
1111

1212
# Mapping log level from Zephyr (none=0, err=1, wrn=2, inf=3, dbg=4) to
1313
# Ethos-U driver (err=0, warn=1, info=2, debug=3)
1414
set(ETHOSU_LOG_SEVERITY_MAP err err warning info debug)
1515
list(LENGTH ETHOSU_LOG_SEVERITY_MAP ETHOSU_LOG_SEVERITY_MAP_LENGTH)
1616

17-
if (${CONFIG_ARM_ETHOS_U_LOG_LEVEL} EQUAL 0)
17+
if (${CONFIG_ETHOS_U_LOG_LEVEL} EQUAL 0)
1818
# The Ethos-U driver does not have a corresponding "none" log level. Disable logging instead.
1919
set(ETHOSU_LOG_ENABLE OFF CACHE BOOL "")
20-
elseif (${CONFIG_ARM_ETHOS_U_LOG_LEVEL} LESS "${ETHOSU_LOG_SEVERITY_MAP_LENGTH}")
21-
list(GET ETHOSU_LOG_SEVERITY_MAP ${CONFIG_ARM_ETHOS_U_LOG_LEVEL} ETHOSU_LOG_SEVERITY)
20+
elseif (${CONFIG_ETHOS_U_LOG_LEVEL} LESS "${ETHOSU_LOG_SEVERITY_MAP_LENGTH}")
21+
list(GET ETHOSU_LOG_SEVERITY_MAP ${CONFIG_ETHOS_U_LOG_LEVEL} ETHOSU_LOG_SEVERITY)
2222
set(ETHOSU_LOG_SEVERITY ${ETHOSU_LOG_SEVERITY} CACHE STRING "")
2323
else()
2424
set(ETHOSU_LOG_SEVERITY debug CACHE STRING "")

‎modules/hal_ethos_u/Kconfig‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,93 +2,93 @@
22
# affiliates <[email protected]></text>
33
# SPDX-License-Identifier: Apache-2.0
44

5-
config ARM_ETHOS_U
5+
config ETHOS_U
66
bool "Ethos-U core driver"
77
default n
88
depends on MULTITHREADING
99
help
1010
This option enables the Arm Ethos-U core driver.
1111

12-
if ARM_ETHOS_U
13-
menu "Arm Ethos-U NPU configuration"
14-
choice ARM_ETHOS_U_NPU_CONFIG
15-
prompt "Arm Ethos-U NPU configuration"
16-
default ARM_ETHOS_U55_128 if SOC_SERIES_MPS3
17-
default ARM_ETHOS_U65_256 if SOC_MPS4_CORSTONE315
18-
default ARM_ETHOS_U85_256 if SOC_MPS4_CORSTONE320
19-
config ARM_ETHOS_U55_64
12+
if ETHOS_U
13+
menu "Ethos-U NPU configuration"
14+
choice ETHOS_U_NPU_CONFIG
15+
prompt "Ethos-U NPU configuration"
16+
default ETHOS_U55_128 if SOC_SERIES_MPS3
17+
default ETHOS_U65_256 if SOC_MPS4_CORSTONE315
18+
default ETHOS_U85_256 if SOC_MPS4_CORSTONE320
19+
config ETHOS_U55_64
2020
bool "using Ethos-U55 with 64 macs"
21-
config ARM_ETHOS_U55_128
21+
config ETHOS_U55_128
2222
bool "using Ethos-U55 with 128 macs"
23-
config ARM_ETHOS_U55_256
23+
config ETHOS_U55_256
2424
bool "using Ethos-U55 with 256 macs"
25-
config ARM_ETHOS_U65_128
25+
config ETHOS_U65_128
2626
bool "using Ethos-U65 with 128 macs"
27-
config ARM_ETHOS_U65_256
27+
config ETHOS_U65_256
2828
bool "using Ethos-U65 with 256 macs"
29-
config ARM_ETHOS_U65_512
29+
config ETHOS_U65_512
3030
bool "using Ethos-U65 with 512 macs"
31-
config ARM_ETHOS_U85_128
31+
config ETHOS_U85_128
3232
bool "using Ethos-U85 with 128 macs"
33-
config ARM_ETHOS_U85_256
33+
config ETHOS_U85_256
3434
bool "using Ethos-U85 with 256 macs"
35-
config ARM_ETHOS_U85_512
35+
config ETHOS_U85_512
3636
bool "using Ethos-U85 with 512 macs"
37-
config ARM_ETHOS_U85_1024
37+
config ETHOS_U85_1024
3838
bool "using Ethos-U85 with 1024 macs"
39-
config ARM_ETHOS_U85_2048
39+
config ETHOS_U85_2048
4040
bool "using Ethos-U85 with 2048 macs"
4141
endchoice
4242
endmenu
4343

44-
config ARM_ETHOS_U_NPU_NAME
44+
config ETHOS_U_NPU_NAME
4545
string
46-
default "ethos-u55-64" if ARM_ETHOS_U55_64
47-
default "ethos-u55-128" if ARM_ETHOS_U55_128
48-
default "ethos-u55-256" if ARM_ETHOS_U55_256
49-
default "ethos-u65-128" if ARM_ETHOS_U65_128
50-
default "ethos-u65-256" if ARM_ETHOS_U65_256
51-
default "ethos-u65-512" if ARM_ETHOS_U65_512
52-
default "ethos-u85-128" if ARM_ETHOS_U85_128
53-
default "ethos-u85-256" if ARM_ETHOS_U85_256
54-
default "ethos-u85-512" if ARM_ETHOS_U85_512
55-
default "ethos-u85-1024" if ARM_ETHOS_U85_1024
56-
default "ethos-u85-2048" if ARM_ETHOS_U85_2048
46+
default "ethos-u55-64" if ETHOS_U55_64
47+
default "ethos-u55-128" if ETHOS_U55_128
48+
default "ethos-u55-256" if ETHOS_U55_256
49+
default "ethos-u65-128" if ETHOS_U65_128
50+
default "ethos-u65-256" if ETHOS_U65_256
51+
default "ethos-u65-512" if ETHOS_U65_512
52+
default "ethos-u85-128" if ETHOS_U85_128
53+
default "ethos-u85-256" if ETHOS_U85_256
54+
default "ethos-u85-512" if ETHOS_U85_512
55+
default "ethos-u85-1024" if ETHOS_U85_1024
56+
default "ethos-u85-2048" if ETHOS_U85_2048
5757
help
58-
Name of the used Arm NPU
58+
Name of the used Ethos-U NPU
5959

60-
choice "ARM_ETHOS_U_LOG_LEVEL_CHOICE"
61-
prompt "Max compiled-in log level for arm_ethos_u"
62-
default ARM_ETHOS_U_LOG_LEVEL_WRN
60+
choice "ETHOS_U_LOG_LEVEL_CHOICE"
61+
prompt "Max compiled-in log level for ETHOS_U"
62+
default ETHOS_U_LOG_LEVEL_WRN
6363
depends on STDOUT_CONSOLE
6464

65-
config ARM_ETHOS_U_LOG_LEVEL_NONE
65+
config ETHOS_U_LOG_LEVEL_NONE
6666
bool "None"
6767

68-
config ARM_ETHOS_U_LOG_LEVEL_ERR
68+
config ETHOS_U_LOG_LEVEL_ERR
6969
bool "Error"
7070

71-
config ARM_ETHOS_U_LOG_LEVEL_WRN
71+
config ETHOS_U_LOG_LEVEL_WRN
7272
bool "Warning"
7373

74-
config ARM_ETHOS_U_LOG_LEVEL_INF
74+
config ETHOS_U_LOG_LEVEL_INF
7575
bool "Info"
7676

77-
config ARM_ETHOS_U_LOG_LEVEL_DBG
77+
config ETHOS_U_LOG_LEVEL_DBG
7878
bool "Debug"
7979

80-
config ARM_ETHOS_U_LOG_LEVEL_DEFAULT
80+
config ETHOS_U_LOG_LEVEL_DEFAULT
8181
bool "Default"
8282

8383
endchoice
8484

85-
config ARM_ETHOS_U_LOG_LEVEL
85+
config ETHOS_U_LOG_LEVEL
8686
int
8787
depends on STDOUT_CONSOLE
88-
default 0 if ARM_ETHOS_U_LOG_LEVEL_NONE
89-
default 1 if ARM_ETHOS_U_LOG_LEVEL_ERR
90-
default 2 if ARM_ETHOS_U_LOG_LEVEL_WRN
91-
default 3 if ARM_ETHOS_U_LOG_LEVEL_INF
92-
default 4 if ARM_ETHOS_U_LOG_LEVEL_DBG
88+
default 0 if ETHOS_U_LOG_LEVEL_NONE
89+
default 1 if ETHOS_U_LOG_LEVEL_ERR
90+
default 2 if ETHOS_U_LOG_LEVEL_WRN
91+
default 3 if ETHOS_U_LOG_LEVEL_INF
92+
default 4 if ETHOS_U_LOG_LEVEL_DBG
9393

9494
endif

‎modules/tflite-micro/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
2424
zephyr_library_compile_definitions(CMSIS_NN)
2525
endif()
2626

27-
if (CONFIG_ARM_ETHOS_U)
27+
if (CONFIG_ETHOS_U)
2828
set(ETHOSU_CO_PROCESSOR ethos_u)
2929
endif()
3030

0 commit comments

Comments
 (0)