diff --git a/.gitignore b/.gitignore index 841674a95f..84ffda0eae 100644 --- a/.gitignore +++ b/.gitignore @@ -11,13 +11,13 @@ __pycache__/ proto.gv* .DS_Store crypto/tests/libtrezor-crypto.so.dSYM/ -/west/.west/ -/west/bootloader/ -/west/modules/ -/west/nrf/ -/west/nrfxlib/ -/west/test/ -/west/tools/ -/west/zephyr/ -/west/trezor/build/ -/west/trezor/trezor-ble/build/ +/nordic/.west/ +/nordic/bootloader/ +/nordic/modules/ +/nordic/nrf/ +/nordic/nrfxlib/ +/nordic/test/ +/nordic/tools/ +/nordic/zephyr/ +/nordic/trezor/build/ +/nordic/trezor/trezor-ble/build/ diff --git a/.pylintrc b/.pylintrc index 145f3d1177..fe36f8e970 100644 --- a/.pylintrc +++ b/.pylintrc @@ -8,7 +8,7 @@ ignore-paths= crypto, legacy, storage, - west, + nordic, fail-under=10.0 jobs=0 load-plugins=trezor_pylint_plugin diff --git a/.yamllint.yml b/.yamllint.yml index ef13be9ba3..4971471f44 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -5,7 +5,7 @@ ignore: | vendor/ /common/defs/ethereum/chains/ /common/defs/ethereum/tokens/ - /west/ + /nordic/ rules: # fix for truthy warning on github action files diff --git a/west/trezor/CMakeLists.txt b/nordic/trezor/CMakeLists.txt similarity index 100% rename from west/trezor/CMakeLists.txt rename to nordic/trezor/CMakeLists.txt diff --git a/west/trezor/Kconfig b/nordic/trezor/Kconfig similarity index 100% rename from west/trezor/Kconfig rename to nordic/trezor/Kconfig diff --git a/west/trezor/README.md b/nordic/trezor/README.md similarity index 100% rename from west/trezor/README.md rename to nordic/trezor/README.md diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.defconfig b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.defconfig similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.defconfig rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.defconfig diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.t3w1_d1_nrf52833 b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.t3w1_d1_nrf52833 similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.t3w1_d1_nrf52833 rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/Kconfig.t3w1_d1_nrf52833 diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/board.cmake b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/board.cmake similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/board.cmake rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/board.cmake diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/board.yml b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/board.yml similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/board.yml rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/board.yml diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/pre_dt_board.cmake b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/pre_dt_board.cmake similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/pre_dt_board.cmake rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/pre_dt_board.cmake diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833-pinctrl.dtsi b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833-pinctrl.dtsi similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833-pinctrl.dtsi rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833-pinctrl.dtsi diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.dts diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.yaml b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.yaml similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.yaml rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833.yaml diff --git a/west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833_defconfig b/nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833_defconfig similarity index 100% rename from west/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833_defconfig rename to nordic/trezor/boards/arm/t3w1_d1_nrf52833/t3w1_d1_nrf52833_defconfig diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.defconfig b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.defconfig similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.defconfig rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.defconfig diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.t3w1_revA_nrf52832 b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.t3w1_revA_nrf52832 similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.t3w1_revA_nrf52832 rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/Kconfig.t3w1_revA_nrf52832 diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/board.cmake b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/board.cmake similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/board.cmake rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/board.cmake diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/board.yml b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/board.yml similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/board.yml rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/board.yml diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/pre_dt_board.cmake b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/pre_dt_board.cmake similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/pre_dt_board.cmake rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/pre_dt_board.cmake diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832-pinctrl.dtsi b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832-pinctrl.dtsi similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832-pinctrl.dtsi rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832-pinctrl.dtsi diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.yaml b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.yaml similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.yaml rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.yaml diff --git a/west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832_defconfig b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832_defconfig similarity index 100% rename from west/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832_defconfig rename to nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832_defconfig diff --git a/west/trezor/dts/bindings/sensor/zephyr,example-sensor.yaml b/nordic/trezor/dts/bindings/sensor/zephyr,example-sensor.yaml similarity index 100% rename from west/trezor/dts/bindings/sensor/zephyr,example-sensor.yaml rename to nordic/trezor/dts/bindings/sensor/zephyr,example-sensor.yaml diff --git a/west/trezor/scripts/example_west_command.py b/nordic/trezor/scripts/example_west_command.py similarity index 100% rename from west/trezor/scripts/example_west_command.py rename to nordic/trezor/scripts/example_west_command.py diff --git a/west/trezor/scripts/west-commands.yml b/nordic/trezor/scripts/west-commands.yml similarity index 100% rename from west/trezor/scripts/west-commands.yml rename to nordic/trezor/scripts/west-commands.yml diff --git a/west/trezor/tests/lib/custom/CMakeLists.txt b/nordic/trezor/tests/lib/custom/CMakeLists.txt similarity index 100% rename from west/trezor/tests/lib/custom/CMakeLists.txt rename to nordic/trezor/tests/lib/custom/CMakeLists.txt diff --git a/west/trezor/tests/lib/custom/prj.conf b/nordic/trezor/tests/lib/custom/prj.conf similarity index 100% rename from west/trezor/tests/lib/custom/prj.conf rename to nordic/trezor/tests/lib/custom/prj.conf diff --git a/west/trezor/tests/lib/custom/src/main.c b/nordic/trezor/tests/lib/custom/src/main.c similarity index 100% rename from west/trezor/tests/lib/custom/src/main.c rename to nordic/trezor/tests/lib/custom/src/main.c diff --git a/west/trezor/tests/lib/custom/testcase.yaml b/nordic/trezor/tests/lib/custom/testcase.yaml similarity index 100% rename from west/trezor/tests/lib/custom/testcase.yaml rename to nordic/trezor/tests/lib/custom/testcase.yaml diff --git a/west/trezor/trezor-ble/CMakeLists.txt b/nordic/trezor/trezor-ble/CMakeLists.txt similarity index 100% rename from west/trezor/trezor-ble/CMakeLists.txt rename to nordic/trezor/trezor-ble/CMakeLists.txt diff --git a/west/trezor/trezor-ble/Kconfig b/nordic/trezor/trezor-ble/Kconfig similarity index 100% rename from west/trezor/trezor-ble/Kconfig rename to nordic/trezor/trezor-ble/Kconfig diff --git a/west/trezor/trezor-ble/VERSION b/nordic/trezor/trezor-ble/VERSION similarity index 100% rename from west/trezor/trezor-ble/VERSION rename to nordic/trezor/trezor-ble/VERSION diff --git a/west/trezor/trezor-ble/app.yaml b/nordic/trezor/trezor-ble/app.yaml similarity index 100% rename from west/trezor/trezor-ble/app.yaml rename to nordic/trezor/trezor-ble/app.yaml diff --git a/west/trezor/trezor-ble/boards/t3w1_d1_nrf52833.conf b/nordic/trezor/trezor-ble/boards/t3w1_d1_nrf52833.conf similarity index 100% rename from west/trezor/trezor-ble/boards/t3w1_d1_nrf52833.conf rename to nordic/trezor/trezor-ble/boards/t3w1_d1_nrf52833.conf diff --git a/west/trezor/trezor-ble/boards/t3w1_d1_nrf52833.overlay b/nordic/trezor/trezor-ble/boards/t3w1_d1_nrf52833.overlay similarity index 100% rename from west/trezor/trezor-ble/boards/t3w1_d1_nrf52833.overlay rename to nordic/trezor/trezor-ble/boards/t3w1_d1_nrf52833.overlay diff --git a/west/trezor/trezor-ble/boards/t3w1_revA_nrf52832.conf b/nordic/trezor/trezor-ble/boards/t3w1_revA_nrf52832.conf similarity index 100% rename from west/trezor/trezor-ble/boards/t3w1_revA_nrf52832.conf rename to nordic/trezor/trezor-ble/boards/t3w1_revA_nrf52832.conf diff --git a/west/trezor/trezor-ble/boards/t3w1_revA_nrf52832.overlay b/nordic/trezor/trezor-ble/boards/t3w1_revA_nrf52832.overlay similarity index 100% rename from west/trezor/trezor-ble/boards/t3w1_revA_nrf52832.overlay rename to nordic/trezor/trezor-ble/boards/t3w1_revA_nrf52832.overlay diff --git a/west/trezor/trezor-ble/debug.conf b/nordic/trezor/trezor-ble/debug.conf similarity index 100% rename from west/trezor/trezor-ble/debug.conf rename to nordic/trezor/trezor-ble/debug.conf diff --git a/west/trezor/trezor-ble/pm_static.yml b/nordic/trezor/trezor-ble/pm_static.yml similarity index 100% rename from west/trezor/trezor-ble/pm_static.yml rename to nordic/trezor/trezor-ble/pm_static.yml diff --git a/west/trezor/trezor-ble/prj.conf b/nordic/trezor/trezor-ble/prj.conf similarity index 100% rename from west/trezor/trezor-ble/prj.conf rename to nordic/trezor/trezor-ble/prj.conf diff --git a/west/trezor/trezor-ble/src/ble/advertising.c b/nordic/trezor/trezor-ble/src/ble/advertising.c similarity index 100% rename from west/trezor/trezor-ble/src/ble/advertising.c rename to nordic/trezor/trezor-ble/src/ble/advertising.c diff --git a/west/trezor/trezor-ble/src/ble/ble.c b/nordic/trezor/trezor-ble/src/ble/ble.c similarity index 100% rename from west/trezor/trezor-ble/src/ble/ble.c rename to nordic/trezor/trezor-ble/src/ble/ble.c diff --git a/west/trezor/trezor-ble/src/ble/ble_internal.h b/nordic/trezor/trezor-ble/src/ble/ble_internal.h similarity index 100% rename from west/trezor/trezor-ble/src/ble/ble_internal.h rename to nordic/trezor/trezor-ble/src/ble/ble_internal.h diff --git a/west/trezor/trezor-ble/src/ble/bonds.c b/nordic/trezor/trezor-ble/src/ble/bonds.c similarity index 100% rename from west/trezor/trezor-ble/src/ble/bonds.c rename to nordic/trezor/trezor-ble/src/ble/bonds.c diff --git a/west/trezor/trezor-ble/src/ble/connection.c b/nordic/trezor/trezor-ble/src/ble/connection.c similarity index 100% rename from west/trezor/trezor-ble/src/ble/connection.c rename to nordic/trezor/trezor-ble/src/ble/connection.c diff --git a/west/trezor/trezor-ble/src/ble/inc/ble/ble.h b/nordic/trezor/trezor-ble/src/ble/inc/ble/ble.h similarity index 100% rename from west/trezor/trezor-ble/src/ble/inc/ble/ble.h rename to nordic/trezor/trezor-ble/src/ble/inc/ble/ble.h diff --git a/west/trezor/trezor-ble/src/ble/management.c b/nordic/trezor/trezor-ble/src/ble/management.c similarity index 100% rename from west/trezor/trezor-ble/src/ble/management.c rename to nordic/trezor/trezor-ble/src/ble/management.c diff --git a/west/trezor/trezor-ble/src/ble/pairing.c b/nordic/trezor/trezor-ble/src/ble/pairing.c similarity index 100% rename from west/trezor/trezor-ble/src/ble/pairing.c rename to nordic/trezor/trezor-ble/src/ble/pairing.c diff --git a/west/trezor/trezor-ble/src/ble/service.c b/nordic/trezor/trezor-ble/src/ble/service.c similarity index 100% rename from west/trezor/trezor-ble/src/ble/service.c rename to nordic/trezor/trezor-ble/src/ble/service.c diff --git a/west/trezor/trezor-ble/src/main.c b/nordic/trezor/trezor-ble/src/main.c similarity index 100% rename from west/trezor/trezor-ble/src/main.c rename to nordic/trezor/trezor-ble/src/main.c diff --git a/west/trezor/trezor-ble/src/power_management/inc/power_management/power_management.h b/nordic/trezor/trezor-ble/src/power_management/inc/power_management/power_management.h similarity index 100% rename from west/trezor/trezor-ble/src/power_management/inc/power_management/power_management.h rename to nordic/trezor/trezor-ble/src/power_management/inc/power_management/power_management.h diff --git a/west/trezor/trezor-ble/src/power_management/power_management.c b/nordic/trezor/trezor-ble/src/power_management/power_management.c similarity index 100% rename from west/trezor/trezor-ble/src/power_management/power_management.c rename to nordic/trezor/trezor-ble/src/power_management/power_management.c diff --git a/west/trezor/trezor-ble/src/signals/inc/signals/signals.h b/nordic/trezor/trezor-ble/src/signals/inc/signals/signals.h similarity index 100% rename from west/trezor/trezor-ble/src/signals/inc/signals/signals.h rename to nordic/trezor/trezor-ble/src/signals/inc/signals/signals.h diff --git a/west/trezor/trezor-ble/src/signals/signals.c b/nordic/trezor/trezor-ble/src/signals/signals.c similarity index 100% rename from west/trezor/trezor-ble/src/signals/signals.c rename to nordic/trezor/trezor-ble/src/signals/signals.c diff --git a/west/trezor/trezor-ble/src/trz_comm/inc/trz_comm/trz_comm.h b/nordic/trezor/trezor-ble/src/trz_comm/inc/trz_comm/trz_comm.h similarity index 100% rename from west/trezor/trezor-ble/src/trz_comm/inc/trz_comm/trz_comm.h rename to nordic/trezor/trezor-ble/src/trz_comm/inc/trz_comm/trz_comm.h diff --git a/west/trezor/trezor-ble/src/trz_comm/spi.c b/nordic/trezor/trezor-ble/src/trz_comm/spi.c similarity index 100% rename from west/trezor/trezor-ble/src/trz_comm/spi.c rename to nordic/trezor/trezor-ble/src/trz_comm/spi.c diff --git a/west/trezor/trezor-ble/src/trz_comm/trz_comm.c b/nordic/trezor/trezor-ble/src/trz_comm/trz_comm.c similarity index 100% rename from west/trezor/trezor-ble/src/trz_comm/trz_comm.c rename to nordic/trezor/trezor-ble/src/trz_comm/trz_comm.c diff --git a/west/trezor/trezor-ble/src/trz_comm/trz_comm_internal.h b/nordic/trezor/trezor-ble/src/trz_comm/trz_comm_internal.h similarity index 100% rename from west/trezor/trezor-ble/src/trz_comm/trz_comm_internal.h rename to nordic/trezor/trezor-ble/src/trz_comm/trz_comm_internal.h diff --git a/west/trezor/trezor-ble/src/trz_comm/uart.c b/nordic/trezor/trezor-ble/src/trz_comm/uart.c similarity index 100% rename from west/trezor/trezor-ble/src/trz_comm/uart.c rename to nordic/trezor/trezor-ble/src/trz_comm/uart.c diff --git a/west/trezor/trezor-ble/sysbuild.conf b/nordic/trezor/trezor-ble/sysbuild.conf similarity index 100% rename from west/trezor/trezor-ble/sysbuild.conf rename to nordic/trezor/trezor-ble/sysbuild.conf diff --git a/west/trezor/trezor-ble/sysbuild/mcuboot.conf b/nordic/trezor/trezor-ble/sysbuild/mcuboot.conf similarity index 100% rename from west/trezor/trezor-ble/sysbuild/mcuboot.conf rename to nordic/trezor/trezor-ble/sysbuild/mcuboot.conf diff --git a/west/trezor/west.yml b/nordic/trezor/west.yml similarity index 100% rename from west/trezor/west.yml rename to nordic/trezor/west.yml diff --git a/west/trezor/zephyr/module.yml b/nordic/trezor/zephyr/module.yml similarity index 100% rename from west/trezor/zephyr/module.yml rename to nordic/trezor/zephyr/module.yml diff --git a/tools/style.c.include b/tools/style.c.include index 8e87505314..e86538fc93 100644 --- a/tools/style.c.include +++ b/tools/style.c.include @@ -3,4 +3,4 @@ ^\./crypto/ ^\./legacy/ ^\./storage/ -^\./west/trezor +^\./nordic/trezor