From 503721bbcc6a5ea23b73d4531a7d001e1e8af2b1 Mon Sep 17 00:00:00 2001 From: Yishai Jaffe Date: Wed, 18 Dec 2024 14:21:38 +0200 Subject: [PATCH] boards: silabs: removed FLASH_BASE_ADDRESS Removed FLASH_BASE_ADDRESS configuration from various boards' Kconfig. The only thing needed in order to do this was to update the relevant dtsi files so that the flash0 node has its reg property configured properly. Signed-off-by: Yishai Jaffe --- boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig | 4 ---- .../silabs/radio_boards/slwrb4104a/Kconfig.defconfig | 4 ---- .../silabs/radio_boards/slwrb4161a/Kconfig.defconfig | 4 ---- .../silabs/radio_boards/slwrb4170a/Kconfig.defconfig | 4 ---- .../silabs/radio_boards/slwrb4180a/Kconfig.defconfig | 4 ---- .../silabs/radio_boards/slwrb4250b/Kconfig.defconfig | 4 ---- .../silabs/radio_boards/slwrb4255a/Kconfig.defconfig | 4 ---- .../silabs/radio_boards/xg24_rb4187c/Kconfig.defconfig | 4 ---- .../thing_plus_matter_mgm240p/Kconfig.defconfig | 4 ---- dts/arm/silabs/efr32mg24.dtsi | 2 +- dts/arm/silabs/efr32mg24b020f1536im40.dtsi | 10 ++++------ dts/arm/silabs/efr32mg24b220f1536im48.dtsi | 10 ++++------ dts/arm/silabs/efr32mg24b310f1536im48.dtsi | 10 ++++------ 13 files changed, 13 insertions(+), 55 deletions(-) diff --git a/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig b/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig index 098b80000ac..b1997386732 100644 --- a/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig +++ b/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig @@ -9,10 +9,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x08000000 - if SOC_GECKO_USE_RAIL config FPU diff --git a/boards/silabs/radio_boards/slwrb4104a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4104a/Kconfig.defconfig index 37a549f4fa7..35290c1e564 100644 --- a/boards/silabs/radio_boards/slwrb4104a/Kconfig.defconfig +++ b/boards/silabs/radio_boards/slwrb4104a/Kconfig.defconfig @@ -10,10 +10,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x0 - config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO diff --git a/boards/silabs/radio_boards/slwrb4161a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4161a/Kconfig.defconfig index 0c706e35bcb..a9577b3eac5 100644 --- a/boards/silabs/radio_boards/slwrb4161a/Kconfig.defconfig +++ b/boards/silabs/radio_boards/slwrb4161a/Kconfig.defconfig @@ -10,10 +10,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x0 - config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO diff --git a/boards/silabs/radio_boards/slwrb4170a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4170a/Kconfig.defconfig index b9054a3c46c..47f7d487a25 100644 --- a/boards/silabs/radio_boards/slwrb4170a/Kconfig.defconfig +++ b/boards/silabs/radio_boards/slwrb4170a/Kconfig.defconfig @@ -10,10 +10,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x0 - config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO diff --git a/boards/silabs/radio_boards/slwrb4180a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4180a/Kconfig.defconfig index 5f917d659c6..1bce3f09eaf 100644 --- a/boards/silabs/radio_boards/slwrb4180a/Kconfig.defconfig +++ b/boards/silabs/radio_boards/slwrb4180a/Kconfig.defconfig @@ -10,10 +10,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x0 - config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO diff --git a/boards/silabs/radio_boards/slwrb4250b/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4250b/Kconfig.defconfig index 489fc5c7a69..3ac04f0f671 100644 --- a/boards/silabs/radio_boards/slwrb4250b/Kconfig.defconfig +++ b/boards/silabs/radio_boards/slwrb4250b/Kconfig.defconfig @@ -10,10 +10,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x0 - config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO diff --git a/boards/silabs/radio_boards/slwrb4255a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4255a/Kconfig.defconfig index c0ac1bf3b3a..ffc370954f5 100644 --- a/boards/silabs/radio_boards/slwrb4255a/Kconfig.defconfig +++ b/boards/silabs/radio_boards/slwrb4255a/Kconfig.defconfig @@ -10,10 +10,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x0 - config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO diff --git a/boards/silabs/radio_boards/xg24_rb4187c/Kconfig.defconfig b/boards/silabs/radio_boards/xg24_rb4187c/Kconfig.defconfig index 0d0d7b04ce2..30f86618bff 100644 --- a/boards/silabs/radio_boards/xg24_rb4187c/Kconfig.defconfig +++ b/boards/silabs/radio_boards/xg24_rb4187c/Kconfig.defconfig @@ -10,10 +10,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x08000000 - config LOG_BACKEND_SWO_FREQ_HZ default 875000 depends on LOG_BACKEND_SWO diff --git a/boards/sparkfun/thing_plus_matter_mgm240p/Kconfig.defconfig b/boards/sparkfun/thing_plus_matter_mgm240p/Kconfig.defconfig index 9c21ba54457..1f5a3c940df 100644 --- a/boards/sparkfun/thing_plus_matter_mgm240p/Kconfig.defconfig +++ b/boards/sparkfun/thing_plus_matter_mgm240p/Kconfig.defconfig @@ -12,10 +12,6 @@ config CMU_HFXO_FREQ config CMU_LFXO_FREQ default 32768 -config FLASH_BASE_ADDRESS - hex - default 0x08000000 - if SOC_GECKO_USE_RAIL config FPU diff --git a/dts/arm/silabs/efr32mg24.dtsi b/dts/arm/silabs/efr32mg24.dtsi index ac2873152b2..cffa3d7b1d3 100644 --- a/dts/arm/silabs/efr32mg24.dtsi +++ b/dts/arm/silabs/efr32mg24.dtsi @@ -268,7 +268,7 @@ #address-cells = <1>; #size-cells = <1>; - flash0: flash@0 { + flash0: flash@8000000 { compatible = "soc-nv-flash"; write-block-size = <4>; erase-block-size = <8192>; diff --git a/dts/arm/silabs/efr32mg24b020f1536im40.dtsi b/dts/arm/silabs/efr32mg24b020f1536im40.dtsi index 4ce3234d1b0..cd1b7767172 100644 --- a/dts/arm/silabs/efr32mg24b020f1536im40.dtsi +++ b/dts/arm/silabs/efr32mg24b020f1536im40.dtsi @@ -16,11 +16,9 @@ compatible = "silabs,efr32mg24b020f1536im40", "silabs,efr32mg24", "silabs,efr32", "simple-bus"; - - flash-controller@50030000 { - flash0: flash@0 { - reg = <0 DT_SIZE_K(1536)>; - }; - }; }; }; + +&flash0 { + reg = <0x08000000 DT_SIZE_K(1536)>; +}; diff --git a/dts/arm/silabs/efr32mg24b220f1536im48.dtsi b/dts/arm/silabs/efr32mg24b220f1536im48.dtsi index a7c2859b0a1..3035598eede 100644 --- a/dts/arm/silabs/efr32mg24b220f1536im48.dtsi +++ b/dts/arm/silabs/efr32mg24b220f1536im48.dtsi @@ -16,11 +16,9 @@ compatible = "silabs,efr32mg24b220f1536im48", "silabs,efr32mg24", "silabs,efr32", "simple-bus"; - - flash-controller@50030000 { - flash0: flash@0 { - reg = <0 DT_SIZE_K(1536)>; - }; - }; }; }; + +&flash0 { + reg = <0x08000000 DT_SIZE_K(1536)>; +}; diff --git a/dts/arm/silabs/efr32mg24b310f1536im48.dtsi b/dts/arm/silabs/efr32mg24b310f1536im48.dtsi index c25171eafbe..f9154086b01 100644 --- a/dts/arm/silabs/efr32mg24b310f1536im48.dtsi +++ b/dts/arm/silabs/efr32mg24b310f1536im48.dtsi @@ -16,11 +16,9 @@ compatible = "silabs,efr32mg24b310f1536im48", "silabs,efr32mg24", "silabs,efr32", "simple-bus"; - - flash-controller@50030000 { - flash0: flash@0 { - reg = <0 DT_SIZE_K(1536)>; - }; - }; }; }; + +&flash0 { + reg = <0x08000000 DT_SIZE_K(1536)>; +};