summaryrefslogtreecommitdiffstats
path: root/board/toradex
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel@ziswiler.com>2015-03-26 01:31:54 +0100
committerTom Warren <twarren@nvidia.com>2015-03-30 10:04:43 -0700
commite57c6e5b50d330516e30f61b824613d551316086 (patch)
treebf397ce8bf430ae712069a958e89f4c398b16db5 /board/toradex
parentd1db97aaa43d6ae5e1e790e872f79d36d8809660 (diff)
downloadblackbird-obmc-uboot-e57c6e5b50d330516e30f61b824613d551316086.tar.gz
blackbird-obmc-uboot-e57c6e5b50d330516e30f61b824613d551316086.zip
ARM: tegra: rename colibri_t20 board/configuration/device-tree
In accordance with our other modules supported by U-Boot and as agreed upon for Apalis/Colibri T30 get rid of the carrier board in the board/ configuration/device-tree naming. While at it also bring the prompt more in line with our other products. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board/toradex')
-rw-r--r--board/toradex/colibri_t20/Kconfig (renamed from board/toradex/colibri_t20_iris/Kconfig)6
-rw-r--r--board/toradex/colibri_t20/MAINTAINERS7
-rw-r--r--board/toradex/colibri_t20/Makefile (renamed from board/toradex/colibri_t20_iris/Makefile)2
-rw-r--r--board/toradex/colibri_t20/colibri_t20.c (renamed from board/toradex/colibri_t20_iris/colibri_t20_iris.c)0
-rw-r--r--board/toradex/colibri_t20_iris/MAINTAINERS6
5 files changed, 11 insertions, 10 deletions
diff --git a/board/toradex/colibri_t20_iris/Kconfig b/board/toradex/colibri_t20/Kconfig
index 4bf727809e..7f373b2d26 100644
--- a/board/toradex/colibri_t20_iris/Kconfig
+++ b/board/toradex/colibri_t20/Kconfig
@@ -1,12 +1,12 @@
-if TARGET_COLIBRI_T20_IRIS
+if TARGET_COLIBRI_T20
config SYS_BOARD
- default "colibri_t20_iris"
+ default "colibri_t20"
config SYS_VENDOR
default "toradex"
config SYS_CONFIG_NAME
- default "colibri_t20_iris"
+ default "colibri_t20"
endif
diff --git a/board/toradex/colibri_t20/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS
new file mode 100644
index 0000000000..b251c000fe
--- /dev/null
+++ b/board/toradex/colibri_t20/MAINTAINERS
@@ -0,0 +1,7 @@
+COLIBRI_T20
+M: Lucas Stach <dev@lynxeye.de>
+S: Maintained
+F: board/toradex/colibri_t20/
+F: include/configs/colibri_t20.h
+F: configs/colibri_t20_defconfig
+F: arch/arm/dts/tegra20-colibri.dtb
diff --git a/board/toradex/colibri_t20_iris/Makefile b/board/toradex/colibri_t20/Makefile
index f286aec041..86f78d9d9d 100644
--- a/board/toradex/colibri_t20_iris/Makefile
+++ b/board/toradex/colibri_t20/Makefile
@@ -6,4 +6,4 @@
include $(srctree)/board/nvidia/common/common.mk
-obj-y += colibri_t20_iris.o
+obj-y += colibri_t20.o
diff --git a/board/toradex/colibri_t20_iris/colibri_t20_iris.c b/board/toradex/colibri_t20/colibri_t20.c
index 46560948a6..46560948a6 100644
--- a/board/toradex/colibri_t20_iris/colibri_t20_iris.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
diff --git a/board/toradex/colibri_t20_iris/MAINTAINERS b/board/toradex/colibri_t20_iris/MAINTAINERS
deleted file mode 100644
index c68955bfa9..0000000000
--- a/board/toradex/colibri_t20_iris/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-COLIBRI_T20_IRIS BOARD
-M: Lucas Stach <dev@lynxeye.de>
-S: Maintained
-F: board/toradex/colibri_t20_iris/
-F: include/configs/colibri_t20_iris.h
-F: configs/colibri_t20_iris_defconfig
OpenPOWER on IntegriCloud