diff --git a/CODEOWNERS b/CODEOWNERS index 6dd78d16e85..34a97afccfb 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -160,7 +160,6 @@ /dts/bindings/*/st,stm32* @erwango /dts/bindings/sensor/ams,ens210.yaml @alexanderwachter /dts/bindings/sensor/ams,iaqcore.yaml @alexanderwachter -/dts/common/sim-flash.dtsi @nvlsianpu /ext/fs/ @nashif @wentongwu /ext/hal/cmsis/ @MaureenHelm @galak /ext/hal/libmetal/ @galak diff --git a/boards/x86/qemu_x86/dts_fixup.h b/boards/x86/qemu_x86/dts_fixup.h index 154bf19b389..365a571b055 100644 --- a/boards/x86/qemu_x86/dts_fixup.h +++ b/boards/x86/qemu_x86/dts_fixup.h @@ -7,6 +7,6 @@ #define DT_ETH_E1000_IRQ_PRIORITY DT_INTEL_E1000_FEBC0000_IRQ_0_PRIORITY #define DT_ETH_E1000_IRQ_FLAGS DT_INTEL_E1000_FEBC0000_IRQ_0_SENSE -#define DT_FLASH_DEV_NAME DT_SIM_FLASH_SIM_FLASH_LABEL +#define DT_FLASH_DEV_NAME DT_ZEPHYR_SIM_FLASH_SIM_FLASH_LABEL /* End of Board Level DTS fixup file */ diff --git a/boards/x86/qemu_x86/qemu_x86.dts b/boards/x86/qemu_x86/qemu_x86.dts index ff8593007c3..6d1c824f829 100644 --- a/boards/x86/qemu_x86/qemu_x86.dts +++ b/boards/x86/qemu_x86/qemu_x86.dts @@ -13,7 +13,6 @@ #endif #include -#include "../../../dts/common/sim-flash.dtsi" / { model = "QEMU X86"; @@ -46,6 +45,22 @@ status = "ok"; }; }; + + sim_flash { + compatible = "zephyr,sim-flash"; + label = "FLASH_SIMULATOR"; + + #address-cells = <1>; + #size-cells = <1>; + + flash_sim0: flash_sim@0 { + compatible = "soc-nv-flash"; + reg = <0x00000000 DT_FLASH_SIZE>; + + erase-block-size = <1024>; + write-block-size = <4>; + }; + }; }; &uart0 { diff --git a/dts/bindings/flash_controller/sim-flash.yaml b/dts/bindings/flash_controller/zephyr,sim-flash.yaml similarity index 92% rename from dts/bindings/flash_controller/sim-flash.yaml rename to dts/bindings/flash_controller/zephyr,sim-flash.yaml index 3b2c2389dc6..ec1762c2d74 100644 --- a/dts/bindings/flash_controller/sim-flash.yaml +++ b/dts/bindings/flash_controller/zephyr,sim-flash.yaml @@ -11,7 +11,7 @@ properties: type: string category: required description: compatible strings - constraint: "sim-flash" + constraint: "zephyr,sim-flash" label: type: string diff --git a/dts/common/sim-flash.dtsi b/dts/common/sim-flash.dtsi deleted file mode 100644 index 6056545c36f..00000000000 --- a/dts/common/sim-flash.dtsi +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2018 Nordic Semiconductor ASA. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/* - * Basic Device Tree file for simulated flash entry declaration. - */ - -/ { - sim_flash { - compatible = "sim-flash"; - label = "FLASH_SIMULATOR"; - - #address-cells = <1>; - #size-cells = <1>; - - flash_sim0: flash_sim@0 { - compatible = "soc-nv-flash"; - reg = <0x00000000 DT_FLASH_SIZE>; - - erase-block-size = <1024>; - write-block-size = <4>; - }; - }; -};