diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 12:16:05 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 12:16:05 (GMT) |
commit | 3e11350255d9c5d4bd03c2a65769da84c05d3294 (patch) | |
tree | 2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaa /arch/arm/dts/zynq-zc706.dts | |
parent | e7538fee991308c16f76f7eca2517089f2a30ff4 (diff) | |
parent | 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb (diff) | |
download | u-boot-fsl-qoriq-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.xz |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
Makefile
drivers/net/npe/Makefile
These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
Diffstat (limited to 'arch/arm/dts/zynq-zc706.dts')
-rw-r--r-- | arch/arm/dts/zynq-zc706.dts | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts new file mode 100644 index 0000000..526fc88 --- /dev/null +++ b/arch/arm/dts/zynq-zc706.dts @@ -0,0 +1,14 @@ +/* + * Xilinx ZC706 board DTS + * + * Copyright (C) 2013 Xilinx, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ +/dts-v1/; +#include "zynq-7000.dtsi" + +/ { + model = "Zynq ZC706 Board"; + compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000"; +}; |