Skip to content

Commit 968d3a9

Browse files
kapi-nogalak
authored andcommitted
dts: flash simulator cleanup
Moved the DT node description for Flash simulator to the board dts file. Signed-off-by: Kamil Piszczek <[email protected]>
1 parent e560999 commit 968d3a9

File tree

5 files changed

+18
-31
lines changed

5 files changed

+18
-31
lines changed

CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
/dts/bindings/*/st,stm32* @erwango
161161
/dts/bindings/sensor/ams,ens210.yaml @alexanderwachter
162162
/dts/bindings/sensor/ams,iaqcore.yaml @alexanderwachter
163-
/dts/common/sim-flash.dtsi @nvlsianpu
164163
/ext/fs/ @nashif @wentongwu
165164
/ext/hal/cmsis/ @MaureenHelm @galak
166165
/ext/hal/libmetal/ @galak

boards/x86/qemu_x86/dts_fixup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#define DT_ETH_E1000_IRQ_PRIORITY DT_INTEL_E1000_FEBC0000_IRQ_0_PRIORITY
88
#define DT_ETH_E1000_IRQ_FLAGS DT_INTEL_E1000_FEBC0000_IRQ_0_SENSE
99

10-
#define DT_FLASH_DEV_NAME DT_SIM_FLASH_SIM_FLASH_LABEL
10+
#define DT_FLASH_DEV_NAME DT_ZEPHYR_SIM_FLASH_SIM_FLASH_LABEL
1111

1212
/* End of Board Level DTS fixup file */

boards/x86/qemu_x86/qemu_x86.dts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#endif
1414

1515
#include <ia32.dtsi>
16-
#include "../../../dts/common/sim-flash.dtsi"
1716

1817
/ {
1918
model = "QEMU X86";
@@ -46,6 +45,22 @@
4645
status = "ok";
4746
};
4847
};
48+
49+
sim_flash {
50+
compatible = "zephyr,sim-flash";
51+
label = "FLASH_SIMULATOR";
52+
53+
#address-cells = <1>;
54+
#size-cells = <1>;
55+
56+
flash_sim0: flash_sim@0 {
57+
compatible = "soc-nv-flash";
58+
reg = <0x00000000 DT_FLASH_SIZE>;
59+
60+
erase-block-size = <1024>;
61+
write-block-size = <4>;
62+
};
63+
};
4964
};
5065

5166
&uart0 {

dts/bindings/flash_controller/sim-flash.yaml renamed to dts/bindings/flash_controller/zephyr,sim-flash.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ properties:
1111
type: string
1212
category: required
1313
description: compatible strings
14-
constraint: "sim-flash"
14+
constraint: "zephyr,sim-flash"
1515

1616
label:
1717
type: string

dts/common/sim-flash.dtsi

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)