summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-09-17 23:35:34 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-09-17 23:35:34 +0200
commitc292adae170fa8c27dca75963bdb0a9afc640e57 (patch)
tree3c1e6bddf7b2b6c6bb92a6329714db0850d05702 /arch/arm/dts
parenta7f99bf139b3aaa0d5494693fd0395084355e41a (diff)
parent4c97f16911e229f6d5bbea5bee52449916e5fa92 (diff)
downloadblackbird-obmc-uboot-c292adae170fa8c27dca75963bdb0a9afc640e57.tar.gz
blackbird-obmc-uboot-c292adae170fa8c27dca75963bdb0a9afc640e57.zip
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/dts')
-rw-r--r--arch/arm/dts/Makefile1
-rw-r--r--arch/arm/dts/imx6q-sabreauto.dts13
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 1ccd8274d2..5f2b946fdd 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -9,7 +9,6 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
exynos5250-smdk5250.dtb \
exynos5420-smdk5420.dtb \
exynos5420-peach-pit.dtb
-dtb-$(CONFIG_MX6) += imx6q-sabreauto.dtb
dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
tegra20-medcom-wide.dtb \
tegra20-paz00.dtb \
diff --git a/arch/arm/dts/imx6q-sabreauto.dts b/arch/arm/dts/imx6q-sabreauto.dts
deleted file mode 100644
index 7af2a88fd0..0000000000
--- a/arch/arm/dts/imx6q-sabreauto.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2012 Freescale Semiconductor, Inc.
- * Copyright 2011 Linaro Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-/dts-v1/;
-
-/ {
- model = "Freescale i.MX6 Quad SABRE Automotive Board";
- compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
-};
OpenPOWER on IntegriCloud