From fba98a1763430850dea1e02a5067926dd41844d9 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 9 Feb 2024 10:38:16 +0000 Subject: [PATCH] soc: nordic_nrf: Migrate nRF9151 to v2 Moves this SoC over from v1 to v2 so it can be used in HWMv2 Signed-off-by: Jamie McCrae --- .../nrf91/Kconfig.defconfig.nrf9151_LACA | 0 soc/nordic_nrf/nrf91/Kconfig.soc | 14 ++++---------- soc/nordic_nrf/soc.yml | 3 ++- 3 files changed, 6 insertions(+), 11 deletions(-) rename soc/{soc_legacy/arm => }/nordic_nrf/nrf91/Kconfig.defconfig.nrf9151_LACA (100%) diff --git a/soc/soc_legacy/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9151_LACA b/soc/nordic_nrf/nrf91/Kconfig.defconfig.nrf9151_LACA similarity index 100% rename from soc/soc_legacy/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9151_LACA rename to soc/nordic_nrf/nrf91/Kconfig.defconfig.nrf9151_LACA diff --git a/soc/nordic_nrf/nrf91/Kconfig.soc b/soc/nordic_nrf/nrf91/Kconfig.soc index 835ed0fbba8..8122fb5b90a 100644 --- a/soc/nordic_nrf/nrf91/Kconfig.soc +++ b/soc/nordic_nrf/nrf91/Kconfig.soc @@ -36,13 +36,7 @@ config SOC_NRF9151_LACA select SOC_NRF9120 config SOC - default "nRF9131_LACA" - depends on SOC_NRF9131_LACA - -config SOC - default "nRF9160_SICA" - depends on SOC_NRF9160_SICA - -config SOC - default "nRF9161_LACA" - depends on SOC_NRF9161_LACA + default "nRF9131_LACA" if SOC_NRF9131_LACA + default "nRF9151_LACA" if SOC_NRF9151_LACA + default "nRF9160_SICA" if SOC_NRF9160_SICA + default "nRF9161_LACA" if SOC_NRF9161_LACA diff --git a/soc/nordic_nrf/soc.yml b/soc/nordic_nrf/soc.yml index b8fbbbb68e5..fb523a0648c 100644 --- a/soc/nordic_nrf/soc.yml +++ b/soc/nordic_nrf/soc.yml @@ -22,6 +22,7 @@ family: - name: cpunet - name: nrf91 socs: + - name: nrf9131 + - name: nrf9151 - name: nrf9160 - name: nrf9161 - - name: nrf9131