mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 01/12] sandbox: dts: retire skeleton.dtsi
Date: Mon, 12 Oct 2020 08:26:08 +0200	[thread overview]
Message-ID: <20201012062619.20400-1-a.fatoum@pengutronix.de> (raw)

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>
---
v1 -> v2: no changes
---
 arch/sandbox/dts/sandbox.dts   | 16 ++++++++++++++--
 arch/sandbox/dts/skeleton.dtsi | 13 -------------
 2 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 arch/sandbox/dts/skeleton.dtsi

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 4576e873d9cb..b3327837a38a 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 8ba7663eb5c0..000000000000
--- 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>; };
-};
-- 
2.28.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2020-10-12  6:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-12  6:26 Ahmad Fatoum [this message]
2020-10-12  6:26 ` [PATCH v2 02/12] of: implement of_property_read_u64_array Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 03/12] sandbox: hostfile: unify --image and direct device tree probe Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 04/12] sandbox: hostfile: support anonymous hostfiles in device tree Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 05/12] sandbox: hostfile: maintain created temp files over reset Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 06/12] sandbox: dts: define default environment node Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 07/12] sandbox: poweroff: migrate to driver probed from device tree Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 08/12] sandbox: power: implement reset source support Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 09/12] sandbox: dts: implement reboot mode Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 10/12] sandbox: add watchdog driver Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 11/12] sandbox: dts: include state node by default Ahmad Fatoum
2020-10-12  6:26 ` [PATCH v2 12/12] sandbox: defconfig: enable new generic features Ahmad Fatoum
2020-10-12 14:36 ` [PATCH v2 01/12] sandbox: dts: retire skeleton.dtsi Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201012062619.20400-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH v2 01/12] sandbox: dts: retire skeleton.dtsi' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox