diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-30 14:24:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-30 14:24:32 +0200 |
| commit | 840b0e06374bfe98d1fabf7f541445d34ba22ed5 (patch) | |
| tree | 98fc49604f71dc5ad9705d37ca97390d2bf97dfe /arch/arm/dts | |
| parent | cfd18f7bcb0c9c93e1e97cf4671cbeb061c10c76 (diff) | |
| parent | e2de305f11864a92cd1ce6ce6a7a42f098f754b6 (diff) | |
| download | barebox-840b0e06374bfe98d1fabf7f541445d34ba22ed5.tar.gz barebox-840b0e06374bfe98d1fabf7f541445d34ba22ed5.tar.xz | |
Merge branch 'for-next/mvebu'
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/dts/armada-385-turris-omnia-bb.dts | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 806d386001..d8abe452b4 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -83,6 +83,7 @@ pbl-dtb-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o pbl-dtb-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o pbl-dtb-$(CONFIG_MACH_TX6X) += imx6q-tx6q.dtb.o +pbl-dtb-$(CONFIG_MACH_TURRIS_OMNIA) += armada-385-turris-omnia-bb.dtb.o pbl-dtb-$(CONFIG_MACH_UDOO) += imx6q-udoo.dtb.o pbl-dtb-$(CONFIG_MACH_USI_TOPKICK) += kirkwood-topkick-bb.dtb.o pbl-dtb-$(CONFIG_MACH_VARISCITE_MX6) += imx6q-var-custom.dtb.o diff --git a/arch/arm/dts/armada-385-turris-omnia-bb.dts b/arch/arm/dts/armada-385-turris-omnia-bb.dts new file mode 100644 index 0000000000..53bef01af7 --- /dev/null +++ b/arch/arm/dts/armada-385-turris-omnia-bb.dts @@ -0,0 +1,7 @@ +#include "arm/armada-385-turris-omnia.dts" + +/ { + chosen { + stdout-path = "/soc/internal-regs/serial@12000"; + }; +}; |