From b683858fd8247011fa4b0eeab91ad79c016c38de Mon Sep 17 00:00:00 2001 From: Balaji Srinivasan Date: Mon, 18 Dec 2023 21:38:14 +0100 Subject: [PATCH] samples: Remove outdated overlay files The samples contained overlay files disabling uart1 for non-secure builds for nrf9160 and nrf9161. These are now removed since uart1 is disabled by default through device tree source file in zephyr. Fixes: CIA-1116 Signed-off-by: Balaji Srinivasan --- .../ciphersuites/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../ciphersuites/boards/nrf9161dk_nrf9161_ns.overlay | 10 ---------- .../boards/nrf9160dk_with_nrf7002ek.overlay | 11 ----------- .../aes_cbc/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../aes_ccm/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../aes_ctr/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../aes_gcm/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../chachapoly/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../crypto/ecdh/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../crypto/ecdsa/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../crypto/eddsa/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../crypto/hkdf/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../crypto/hmac/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../pbkdf2/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../psa_tls/boards/nrf9160dk_nrf9160_ns.overlay | 12 ------------ .../crypto/rng/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../crypto/rsa/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../sha256/boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- .../boards/nrf9160dk_nrf9160_ns.overlay | 10 ---------- 21 files changed, 213 deletions(-) delete mode 100644 samples/cellular/ciphersuites/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/cellular/ciphersuites/boards/nrf9161dk_nrf9161_ns.overlay delete mode 100644 samples/cellular/lwm2m_client/boards/nrf9160dk_with_nrf7002ek.overlay delete mode 100644 samples/crypto/aes_cbc/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/aes_ccm/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/aes_ctr/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/aes_gcm/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/chachapoly/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/ecdh/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/ecdsa/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/eddsa/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/hkdf/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/hmac/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/pbkdf2/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/psa_tls/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/rng/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/rsa/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/crypto/sha256/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/tfm/tfm_hello_world/boards/nrf9160dk_nrf9160_ns.overlay delete mode 100644 samples/tfm/tfm_psa_template/boards/nrf9160dk_nrf9160_ns.overlay diff --git a/samples/cellular/ciphersuites/boards/nrf9160dk_nrf9160_ns.overlay b/samples/cellular/ciphersuites/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index baaf1c29afa..00000000000 --- a/samples/cellular/ciphersuites/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/cellular/ciphersuites/boards/nrf9161dk_nrf9161_ns.overlay b/samples/cellular/ciphersuites/boards/nrf9161dk_nrf9161_ns.overlay deleted file mode 100644 index baaf1c29afa..00000000000 --- a/samples/cellular/ciphersuites/boards/nrf9161dk_nrf9161_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/cellular/lwm2m_client/boards/nrf9160dk_with_nrf7002ek.overlay b/samples/cellular/lwm2m_client/boards/nrf9160dk_with_nrf7002ek.overlay deleted file mode 100644 index 4b371e2d897..00000000000 --- a/samples/cellular/lwm2m_client/boards/nrf9160dk_with_nrf7002ek.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disabled because of conflicts on P0.00 and P0.01 - Arduino pins D0 and D1 - * (iovdd-ctrl-gpios and bucken-gpios in nrf7002ek, respectively). */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/aes_cbc/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/aes_cbc/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/aes_cbc/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/aes_ccm/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/aes_ccm/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/aes_ccm/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/aes_ctr/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/aes_ctr/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/aes_ctr/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/aes_gcm/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/aes_gcm/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/aes_gcm/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/chachapoly/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/chachapoly/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/chachapoly/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/ecdh/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/ecdh/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/ecdh/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/ecdsa/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/ecdsa/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/ecdsa/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/eddsa/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/eddsa/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index 5a4ccf8c3a6..00000000000 --- a/samples/crypto/eddsa/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/hkdf/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/hkdf/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/hkdf/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/hmac/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/hmac/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/hmac/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/pbkdf2/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/pbkdf2/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/pbkdf2/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/persistent_key_usage/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/psa_tls/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/psa_tls/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index 004dd988663..00000000000 --- a/samples/crypto/psa_tls/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2021 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "../app.overlay" - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/rng/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/rng/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/rng/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/rsa/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/rsa/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/rsa/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/crypto/sha256/boards/nrf9160dk_nrf9160_ns.overlay b/samples/crypto/sha256/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/crypto/sha256/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/tfm/tfm_hello_world/boards/nrf9160dk_nrf9160_ns.overlay b/samples/tfm/tfm_hello_world/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/tfm/tfm_hello_world/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -}; diff --git a/samples/tfm/tfm_psa_template/boards/nrf9160dk_nrf9160_ns.overlay b/samples/tfm/tfm_psa_template/boards/nrf9160dk_nrf9160_ns.overlay deleted file mode 100644 index f04333d924c..00000000000 --- a/samples/tfm/tfm_psa_template/boards/nrf9160dk_nrf9160_ns.overlay +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* Disable uart1 in nonsecure since it is used by the TFM secure app. */ -&uart1 { - status = "disabled"; -};