summaryrefslogtreecommitdiffstats
path: root/arch/sandbox
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2020-10-12 08:26:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-10-12 16:35:19 +0200
commit35f0f5f3c0bf14aaf1d3cbfe9735282bd7ee9262 (patch)
tree069abd81f79206dff165bba146315151a7ebcd7c /arch/sandbox
parent03b5a557d7c81be52317b97b19f966bd0c9faa99 (diff)
downloadbarebox-35f0f5f3c0bf14aaf1d3cbfe9735282bd7ee9262.tar.gz
barebox-35f0f5f3c0bf14aaf1d3cbfe9735282bd7ee9262.tar.xz
sandbox: dts: retire skeleton.dtsi
Follow up commits will flesh out the sandbox.dts and make most of what's in the skeleton.dtsi redundant. Merge the .dtsi with the .dts to have all the code at one place. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/sandbox')
-rw-r--r--arch/sandbox/dts/sandbox.dts16
-rw-r--r--arch/sandbox/dts/skeleton.dtsi13
2 files changed, 14 insertions, 15 deletions
diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 4576e873d9..b3327837a3 100644
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -1,8 +1,20 @@
/dts-v1/;
-#include "skeleton.dtsi"
-
/ {
model = "Sandbox";
compatible = "barebox,sandbox";
+
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ aliases {
+ };
+
+ chosen {
+ };
+
+ memory {
+ device_type = "memory";
+ reg = <0 0 0 0>;
+ };
};
diff --git a/arch/sandbox/dts/skeleton.dtsi b/arch/sandbox/dts/skeleton.dtsi
deleted file mode 100644
index 8ba7663eb5..0000000000
--- a/arch/sandbox/dts/skeleton.dtsi
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Skeleton device tree; the bare minimum needed to boot; just include and
- * add a compatible value. The bootloader will typically populate the memory
- * node.
- */
-
-/ {
- #address-cells = <2>;
- #size-cells = <2>;
- chosen { };
- aliases { };
- memory { device_type = "memory"; reg = <0 0 0 0>; };
-};