diff --git a/boards/xtensa/qemu_xtensa/Kconfig.board b/boards/xtensa/qemu_xtensa/Kconfig.board index 052be592cdf..bc053105ef2 100644 --- a/boards/xtensa/qemu_xtensa/Kconfig.board +++ b/boards/xtensa/qemu_xtensa/Kconfig.board @@ -6,4 +6,5 @@ config BOARD_QEMU_XTENSA bool "Xtensa emulation using QEMU" depends on SOC_XTENSA_SAMPLE_CONTROLLER + select HAS_DTS select QEMU_TARGET diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa.dts b/boards/xtensa/qemu_xtensa/qemu_xtensa.dts new file mode 100644 index 00000000000..17552ac1f95 --- /dev/null +++ b/boards/xtensa/qemu_xtensa/qemu_xtensa.dts @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2019 Intel Corporation. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/dts-v1/; + +#include "sample_controller.dtsi" + +/ { + model = "qemu_xtensa"; + compatible = "xtensa, sample_controller"; + + chosen { + zephyr,sram = &sram0; + }; +}; diff --git a/boards/xtensa/xt-sim/Kconfig.board b/boards/xtensa/xt-sim/Kconfig.board index a908a6bba6c..a186d90f0c7 100644 --- a/boards/xtensa/xt-sim/Kconfig.board +++ b/boards/xtensa/xt-sim/Kconfig.board @@ -6,3 +6,4 @@ config BOARD_XT_SIM bool "Xtensa Development ISS" depends on SIMULATOR_XTENSA + select HAS_DTS diff --git a/boards/xtensa/xt-sim/xt-sim.dts b/boards/xtensa/xt-sim/xt-sim.dts new file mode 100644 index 00000000000..1ab3326f3a5 --- /dev/null +++ b/boards/xtensa/xt-sim/xt-sim.dts @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2019 Intel Corporation. + * + * SPDX-License-Identifier: Apache-2.0 + */ +/dts-v1/; + +#include "sample_controller.dtsi" + +/ { + model = "xt-sim"; + compatible = "xtensa,sample_controller"; + + chosen { + zephyr,sram = &sram0; + }; +}; diff --git a/dts/xtensa/sample_controller.dtsi b/dts/xtensa/sample_controller.dtsi new file mode 100644 index 00000000000..d9384cd28f7 --- /dev/null +++ b/dts/xtensa/sample_controller.dtsi @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2019 Intel Corporation. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "skeleton.dtsi" + +/ { + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "sample_controller"; + reg = <0>; + }; + }; + + sram0: memory@60000000 { + device_type = "memory"; + compatible = "mmio-sram"; + reg = <0x60000000 0x4000000>; + }; + + soc { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges; + + }; +}; diff --git a/soc/xtensa/sample_controller/linker.ld b/soc/xtensa/sample_controller/linker.ld index f84e77dd660..9f792c5db95 100644 --- a/soc/xtensa/sample_controller/linker.ld +++ b/soc/xtensa/sample_controller/linker.ld @@ -16,6 +16,7 @@ #include #include +#include #include #include