diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-02-07 18:42:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-10 09:09:49 +0100 |
| commit | fc146460e3b52d8e31718e3af33dcf2dc69581d8 (patch) | |
| tree | 444e554d9d865905a41a0c2d5115a205c64a299a | |
| parent | 1cae0ff61973697d785a4852998d7b802d165dad (diff) | |
| download | barebox-fc146460e3b52d8e31718e3af33dcf2dc69581d8.tar.gz barebox-fc146460e3b52d8e31718e3af33dcf2dc69581d8.tar.xz | |
ARM: dove: separate barebox-specific DT changes
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/solidrun-cubox/lowlevel.c | 4 | ||||
| -rw-r--r-- | arch/arm/dts/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/dts/dove-cubox-bb.dts | 18 |
3 files changed, 22 insertions, 4 deletions
diff --git a/arch/arm/boards/solidrun-cubox/lowlevel.c b/arch/arm/boards/solidrun-cubox/lowlevel.c index 1fcecb5b7c..4b35731e2b 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 07508e3b25..8ca3d79732 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -24,7 +24,7 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \ imx6dl-hummingboard.dtb \ imx6q-nitrogen6x.dtb \ imx6dl-nitrogen6x.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) += \ @@ -43,7 +43,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-edmqmx6.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 0000000000..3d1e5b4fa6 --- /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"; + }; + }; +}; |