summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-04-03 09:14:38 -0400
committerTom Rini <trini@konsulko.com>2015-04-03 09:14:38 -0400
commit692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 (patch)
treee47f18f7dd1507e91a46fcd6f550914ad3774f5a /configs
parent8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 (diff)
parent76a30fedd44428c7108084266389c9b4ba5678c8 (diff)
downloadu-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.zip
u-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.gz
u-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts: board/armltd/vexpress64/vexpress64.c Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/colibri_t20_defconfig5
-rw-r--r--configs/colibri_t20_iris_defconfig5
2 files changed, 5 insertions, 5 deletions
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
new file mode 100644
index 0000000..8987567
--- /dev/null
+++ b/configs/colibri_t20_defconfig
@@ -0,0 +1,5 @@
+CONFIG_ARM=y
+CONFIG_TEGRA=y
+CONFIG_TEGRA20=y
+CONFIG_TARGET_COLIBRI_T20=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig
deleted file mode 100644
index a14d55a..0000000
--- a/configs/colibri_t20_iris_defconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TEGRA=y
-CONFIG_TEGRA20=y
-CONFIG_TARGET_COLIBRI_T20_IRIS=y
-CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"