Merge pull request #6156 from jpbland1/revert-zephyr-relocation

move the zephyr folder back to it's correct location
2025-07-29 18:27:29 +02:00 · 2023-03-03 11:19:35 -08:00
parent 9a597a098b b146830fe8
commit d955ec8d54
41 changed files with 46 additions and 46 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -179,7 +179,7 @@ include tests/include.am
 include sslSniffer/sslSnifferTest/include.am
 include rpm/include.am
 include linuxkm/include.am
-include RTOS/zephyr/include.am
+include zephyr/include.am
 include RTOS/nuttx/include.am

 # Exclude references to non-DFSG sources from build files
--- a/RTOS/zephyr/include.am
+++ b/RTOS/zephyr/include.am
@ -1,45 +0,0 @@
-# vim:ft=automake
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-EXTRA_DIST+= RTOS/zephyr/CMakeLists.txt
-EXTRA_DIST+= RTOS/zephyr/Kconfig
-EXTRA_DIST+= RTOS/zephyr/Kconfig.tls-generic
-EXTRA_DIST+= RTOS/zephyr/zephyr_init.c
-EXTRA_DIST+= RTOS/zephyr/module.yml
-EXTRA_DIST+= RTOS/zephyr/wolfssl/options.h
-EXTRA_DIST+= RTOS/zephyr/nrf5340dk_nrf5340_user_settings.h
-EXTRA_DIST+= RTOS/zephyr/user_settings.h
-EXTRA_DIST+= RTOS/zephyr/user_settings-tls-generic.h
-EXTRA_DIST+= RTOS/zephyr/README.md
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/CMakeLists.txt
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/README
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/install_test.sh
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/prj.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_benchmark/sample.yaml
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_test/CMakeLists.txt
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_test/README
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_test/install_test.sh
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_test/prj.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_test/sample.yaml
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_sock/CMakeLists.txt
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_sock/README
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_sock/install_sample.sh
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_sock/prj.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_sock/sample.yaml
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_sock/src
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_sock/src/tls_sock.c
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/CMakeLists.txt
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/README
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/install_sample.sh
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/prj.conf
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/sample.yaml
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/src
-EXTRA_DIST+= RTOS/zephyr/samples/wolfssl_tls_thread/src/tls_threaded.c
--- a/RTOS/zephyr/CMakeLists.txt
+++ b/RTOS/zephyr/CMakeLists.txt
--- a/RTOS/zephyr/Kconfig
+++ b/RTOS/zephyr/Kconfig
--- a/RTOS/zephyr/Kconfig.tls-generic
+++ b/RTOS/zephyr/Kconfig.tls-generic
--- a/RTOS/zephyr/README.md
+++ b/RTOS/zephyr/README.md
--- a/zephyr/include.am
+++ b/zephyr/include.am
@ -0,0 +1,45 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+EXTRA_DIST+= zephyr/CMakeLists.txt
+EXTRA_DIST+= zephyr/Kconfig
+EXTRA_DIST+= zephyr/Kconfig.tls-generic
+EXTRA_DIST+= zephyr/zephyr_init.c
+EXTRA_DIST+= zephyr/module.yml
+EXTRA_DIST+= zephyr/wolfssl/options.h
+EXTRA_DIST+= zephyr/nrf5340dk_nrf5340_user_settings.h
+EXTRA_DIST+= zephyr/user_settings.h
+EXTRA_DIST+= zephyr/user_settings-tls-generic.h
+EXTRA_DIST+= zephyr/README.md
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/CMakeLists.txt
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/README
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/install_test.sh
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/prj.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_benchmark/sample.yaml
+EXTRA_DIST+= zephyr/samples/wolfssl_test/CMakeLists.txt
+EXTRA_DIST+= zephyr/samples/wolfssl_test/README
+EXTRA_DIST+= zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_test/install_test.sh
+EXTRA_DIST+= zephyr/samples/wolfssl_test/prj.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_test/sample.yaml
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/CMakeLists.txt
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/README
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/install_sample.sh
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/prj.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/sample.yaml
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/src
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/src/tls_sock.c
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/CMakeLists.txt
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/README
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/install_sample.sh
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/prj.conf
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/sample.yaml
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/src
+EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/src/tls_threaded.c
--- a/RTOS/zephyr/module.yml
+++ b/RTOS/zephyr/module.yml
--- a/RTOS/zephyr/nrf5340dk_nrf5340_user_settings.h
+++ b/RTOS/zephyr/nrf5340dk_nrf5340_user_settings.h
--- a/RTOS/zephyr/samples/wolfssl_benchmark/CMakeLists.txt
+++ b/RTOS/zephyr/samples/wolfssl_benchmark/CMakeLists.txt
--- a/RTOS/zephyr/samples/wolfssl_benchmark/README
+++ b/RTOS/zephyr/samples/wolfssl_benchmark/README
--- a/RTOS/zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/RTOS/zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp.conf
--- a/RTOS/zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+++ b/RTOS/zephyr/samples/wolfssl_benchmark/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
--- a/RTOS/zephyr/samples/wolfssl_benchmark/install_test.sh
+++ b/RTOS/zephyr/samples/wolfssl_benchmark/install_test.sh
--- a/RTOS/zephyr/samples/wolfssl_benchmark/prj.conf
+++ b/RTOS/zephyr/samples/wolfssl_benchmark/prj.conf
--- a/RTOS/zephyr/samples/wolfssl_benchmark/sample.yaml
+++ b/RTOS/zephyr/samples/wolfssl_benchmark/sample.yaml
--- a/RTOS/zephyr/samples/wolfssl_test/CMakeLists.txt
+++ b/RTOS/zephyr/samples/wolfssl_test/CMakeLists.txt
--- a/RTOS/zephyr/samples/wolfssl_test/README
+++ b/RTOS/zephyr/samples/wolfssl_test/README
--- a/RTOS/zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/RTOS/zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp.conf
--- a/RTOS/zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+++ b/RTOS/zephyr/samples/wolfssl_test/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
--- a/RTOS/zephyr/samples/wolfssl_test/install_test.sh
+++ b/RTOS/zephyr/samples/wolfssl_test/install_test.sh
--- a/RTOS/zephyr/samples/wolfssl_test/prj.conf
+++ b/RTOS/zephyr/samples/wolfssl_test/prj.conf
--- a/RTOS/zephyr/samples/wolfssl_test/sample.yaml
+++ b/RTOS/zephyr/samples/wolfssl_test/sample.yaml
--- a/RTOS/zephyr/samples/wolfssl_tls_sock/CMakeLists.txt
+++ b/RTOS/zephyr/samples/wolfssl_tls_sock/CMakeLists.txt
--- a/RTOS/zephyr/samples/wolfssl_tls_sock/README
+++ b/RTOS/zephyr/samples/wolfssl_tls_sock/README
--- a/RTOS/zephyr/samples/wolfssl_tls_sock/install_sample.sh
+++ b/RTOS/zephyr/samples/wolfssl_tls_sock/install_sample.sh
--- a/RTOS/zephyr/samples/wolfssl_tls_sock/prj.conf
+++ b/RTOS/zephyr/samples/wolfssl_tls_sock/prj.conf
--- a/RTOS/zephyr/samples/wolfssl_tls_sock/sample.yaml
+++ b/RTOS/zephyr/samples/wolfssl_tls_sock/sample.yaml
--- a/RTOS/zephyr/samples/wolfssl_tls_sock/src/tls_sock.c
+++ b/RTOS/zephyr/samples/wolfssl_tls_sock/src/tls_sock.c
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/CMakeLists.txt
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/CMakeLists.txt
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/README
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/README
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp.conf
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/install_sample.sh
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/install_sample.sh
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/prj.conf
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/prj.conf
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/sample.yaml
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/sample.yaml
--- a/RTOS/zephyr/samples/wolfssl_tls_thread/src/tls_threaded.c
+++ b/RTOS/zephyr/samples/wolfssl_tls_thread/src/tls_threaded.c
--- a/RTOS/zephyr/user_settings-tls-generic.h
+++ b/RTOS/zephyr/user_settings-tls-generic.h
--- a/RTOS/zephyr/user_settings.h
+++ b/RTOS/zephyr/user_settings.h
--- a/RTOS/zephyr/wolfssl/options.h
+++ b/RTOS/zephyr/wolfssl/options.h
--- a/RTOS/zephyr/zephyr_init.c
+++ b/RTOS/zephyr/zephyr_init.c