From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
barebox@lists.infradead.org,
Michael Grzeschik <mgr@pengutronix.de>
Subject: [PATCH v2 6/7] ARM: dove: separate barebox-specific DT changes
Date: Fri, 7 Feb 2014 18:42:52 +0100 [thread overview]
Message-ID: <1391794973-32469-1-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1391640009-3399-7-git-send-email-sebastian.hesselbarth@gmail.com>
To ease DT import from Linux, which is still maintained in-tree, we
separate barebox-specific changes by including the original dts in
a separate DT file. This allows to overlay modifications and keep
clean DT history.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Changelog:
v1->v2:
- split-off barebox specific DT overlay
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Michael Grzeschik <mgr@pengutronix.de>
Cc: barebox@lists.infradead.org
---
arch/arm/boards/solidrun-cubox/lowlevel.c | 4 ++--
arch/arm/dts/Makefile | 4 ++--
arch/arm/dts/dove-cubox-bb.dts | 18 ++++++++++++++++++
3 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/dts/dove-cubox-bb.dts
diff --git a/arch/arm/boards/solidrun-cubox/lowlevel.c b/arch/arm/boards/solidrun-cubox/lowlevel.c
index 1fcecb5b7c44..4b35731e2beb 100644
--- a/arch/arm/boards/solidrun-cubox/lowlevel.c
+++ b/arch/arm/boards/solidrun-cubox/lowlevel.c
@@ -21,7 +21,7 @@
#include <asm/barebox-arm-head.h>
#include <mach/lowlevel.h>
-extern char __dtb_dove_cubox_start[];
+extern char __dtb_dove_cubox_bb_start[];
ENTRY_FUNCTION(start_solidrun_cubox, r0, r1, r2)
{
@@ -29,7 +29,7 @@ ENTRY_FUNCTION(start_solidrun_cubox, r0, r1, r2)
arm_cpu_lowlevel_init();
- fdt = (uint32_t)__dtb_dove_cubox_start - get_runtime_offset();
+ fdt = (uint32_t)__dtb_dove_cubox_bb_start - get_runtime_offset();
mvebu_barebox_entry(fdt);
}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index bc314e922185..0f366ca39f5d 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -16,7 +16,7 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
imx6q-mba6x.dtb \
imx6q-phytec-pbab01.dtb \
imx6dl-cubox-i-carrier-1.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox-bb.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5_sockit.dtb \
socfpga_cyclone5_socrates.dtb
dtb-$(CONFIG_ARCH_TEGRA) += \
@@ -35,7 +35,7 @@ pbl-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs70
pbl-$(CONFIG_MACH_PCM051) += am335x-phytec-phycore.dtb.o
pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6q-phytec-pbab01.dtb.o
pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-realq7.dtb.o
-pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox.dtb.o
+pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox-bb.dtb.o
pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o
pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += tegra20-colibri-iris.dtb.o
pbl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o
diff --git a/arch/arm/dts/dove-cubox-bb.dts b/arch/arm/dts/dove-cubox-bb.dts
new file mode 100644
index 000000000000..3d1e5b4fa622
--- /dev/null
+++ b/arch/arm/dts/dove-cubox-bb.dts
@@ -0,0 +1,18 @@
+/*
+ * Barebox specific DT overlay for SolidRun CuBox
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ */
+
+#include "dove-cubox.dts"
+
+/ {
+ chosen {
+ linux,stdout-path = &uart0;
+ };
+
+ leds {
+ power {
+ barebox,default-trigger = "heartbeat";
+ };
+ };
+};
--
1.8.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-02-07 17:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 22:40 [PATCH 0/6] Marvell MVEBU mbus and Orion GBE driver Sebastian Hesselbarth
2014-02-05 22:40 ` [PATCH 1/6] net: reorder Kconfig and Makefile alphabetically Sebastian Hesselbarth
2014-02-05 22:40 ` [PATCH 2/6] net: phy: add of_phy_device_connect Sebastian Hesselbarth
2014-02-05 22:40 ` [PATCH 3/6] bus: mvebu: add mbus driver Sebastian Hesselbarth
2014-02-07 6:58 ` Sascha Hauer
2014-02-07 9:19 ` Sebastian Hesselbarth
2014-02-07 13:06 ` Sebastian Hesselbarth
2014-02-07 17:41 ` [PATCH v2 3/7] " Sebastian Hesselbarth
2014-02-05 22:40 ` [PATCH 4/6] net: phy: add mvebu mdio bus driver Sebastian Hesselbarth
2014-02-05 22:40 ` [PATCH 5/6] net: orion: add ethernet driver Sebastian Hesselbarth
2014-02-05 22:40 ` [PATCH 6/6] ARM: dove: sync with DT files from Linux Sebastian Hesselbarth
2014-02-07 9:33 ` Sebastian Hesselbarth
2014-02-07 11:03 ` Sascha Hauer
2014-02-07 17:42 ` Sebastian Hesselbarth [this message]
2014-02-07 17:42 ` [PATCH v2 6/7] " Sebastian Hesselbarth
2014-02-07 17:45 ` Sebastian Hesselbarth
2014-02-10 8:11 ` Sascha Hauer
2014-02-07 7:21 ` [PATCH 0/6] Marvell MVEBU mbus and Orion GBE driver Sascha Hauer
2014-02-07 9:22 ` Sebastian Hesselbarth
2014-02-07 9:51 ` 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=1391794973-32469-1-git-send-email-sebastian.hesselbarth@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=barebox@lists.infradead.org \
--cc=mgr@pengutronix.de \
--cc=thomas.petazzoni@free-electrons.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox