Skip to contentSkip to conversation

ARM: tegra: add Colibri T30 board support

PATCH New Stefan Agner 2 participants 2 messages Aug 5, 2014 – Aug 6, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: tegra: add Colibri T30 board support

This adds board support for the Toradex Colibri T30 module.

Working functions:
- SD card boot
- eMMC environment and boot
- USB host/USB client (on the dual role port)
- Network (via ASIX USB)

---
This patch requires Stephens patch "ARM: tegra: enable DFU too" applied first!

Changes in v2:
- Added missing files MAINTAINERS/Kconfig/colibri_t30_defconfig
- Moved USB vbus GPIO to dts file
- Don't set fdtfile/board_name by default, we can set them at flash time using ./tegra-uboot-flasher flash colibri_t30 --env fdtfile tegra30-colibri-eval-v3.dtb
- Removed superfluous defines
- Switch USB0 to peripheral by default

 arch/arm/Kconfig                                   |   4 +
 arch/arm/dts/Makefile                              |   1 +
 arch/arm/dts/tegra30-colibri.dts                   |  85 +++++
 arch/arm/include/asm/mach-types.h                  |  13 +
 board/toradex/colibri_t30/Kconfig                  |  24 ++
 board/toradex/colibri_t30/MAINTAINERS              |   7 +
 board/toradex/colibri_t30/Makefile                 |   6 +
 board/toradex/colibri_t30/colibri_t30.c            |  42 +++
 .../colibri_t30/pinmux-config-colibri_t30.h        | 360 +++++++++++++++++++++
 configs/colibri_t30_defconfig                      |   3 +
 include/configs/colibri_t30.h                      |  67 ++++
 11 files changed, 612 insertions(+)
 create mode 100644 arch/arm/dts/tegra30-colibri.dts
 create mode 100644 board/toradex/colibri_t30/Kconfig
 create mode 100644 board/toradex/colibri_t30/MAINTAINERS
 create mode 100644 board/toradex/colibri_t30/Makefile
 create mode 100644 board/toradex/colibri_t30/colibri_t30.c
 create mode 100644 board/toradex/colibri_t30/pinmux-config-colibri_t30.h
 create mode 100644 configs/colibri_t30_defconfig
 create mode 100644 include/configs/colibri_t30.h
arch/arm/Kconfig +4 -0
index e385eda..dd987cc 100644
@@ -701,6 +701,9 @@ config TARGET_WHISTLER
 config TARGET_COLIBRI_T20_IRIS
 	bool "Support colibri_t20_iris"
 
+config TARGET_COLIBRI_T30
+	bool "Support Colibri T30"
+
 config TARGET_TEC_NG
 	bool "Support tec-ng"
 
@@ -989,6 +992,7 @@ source "board/timll/devkit3250/Kconfig"
 source "board/timll/devkit8000/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/toradex/colibri_t20_iris/Kconfig"
+source "board/toradex/colibri_t30/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
arch/arm/dts/Makefile +1 -0
index 6e2e313..c46b7be 100644
@@ -21,6 +21,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
 	tegra20-colibri_t20_iris.dtb \
 	tegra30-beaver.dtb \
 	tegra30-cardhu.dtb \
+	tegra30-colibri.dtb \
 	tegra30-tec-ng.dtb \
 	tegra114-dalmore.dtb \
 	tegra124-jetson-tk1.dtb \
arch/arm/dts/tegra30-colibri.dts new file +85 -0

85 lines not on this page · raw message

arch/arm/include/asm/mach-types.h +13 -0
index 440b041..560924e 100644
@@ -1106,6 +1106,7 @@ extern unsigned int __machine_arch_type;
 #define MACH_TYPE_OMAP5_SEVM           3777
 #define MACH_TYPE_ARMADILLO_800EVA     3863
 #define MACH_TYPE_KZM9G                4140
+#define MACH_TYPE_COLIBRI_T30          4493
 
 #ifdef CONFIG_ARCH_EBSA110
 # ifdef machine_arch_type
@@ -14235,6 +14236,18 @@ extern unsigned int __machine_arch_type;
 # define machine_is_kzm9g()	(0)
 #endif
 
+#ifdef CONFIG_MACH_COLIBRI_T30
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_COLIBRI_T30
+# endif
+# define machine_is_colibri_t30()	(machine_arch_type == MACH_TYPE_COLIBRI_T30)
+#else
+# define machine_is_colibri_t30()	(0)
+#endif
+
 /*
  * These have not yet been registered
  */
board/toradex/colibri_t30/Kconfig new file +24 -0
new file mode 100644
index 0000000..fcf5e8e
@@ -0,0 +1,24 @@
+if TARGET_COLIBRI_T30
+
+config SYS_CPU
+	string
+	default "arm720t" if SPL_BUILD
+	default "armv7" if !SPL_BUILD
+
+config SYS_BOARD
+	string
+	default "colibri_t30"
+
+config SYS_VENDOR
+	string
+	default "toradex"
+
+config SYS_SOC
+	string
+	default "tegra30"
+
+config SYS_CONFIG_NAME
+	string
+	default "colibri_t30"
+
+endif
board/toradex/colibri_t30/MAINTAINERS new file +7 -0
new file mode 100644
index 0000000..73b8e5d
@@ -0,0 +1,7 @@
+Colibri T30
+M:	Stefan Agner <[email protected]>
+S:	Maintained
+F:	board/toradex/colibri_t30/
+F:	include/configs/colibri_t30.h
+F:	configs/colibri_t30_defconfig
+F:	arch/arm/dts/tegra30-colibri.dtb
board/toradex/colibri_t30/Makefile new file +6 -0
new file mode 100644
index 0000000..3d58a4b
@@ -0,0 +1,6 @@
+# Copyright (c) 2013-2014 Stefan Agner
+# SPDX-License-Identifier:      GPL-2.0+
+
+include $(srctree)/board/nvidia/common/common.mk
+
+obj-y	+= colibri_t30.o
board/toradex/colibri_t30/colibri_t30.c new file +42 -0

42 lines not on this page · raw message

board/toradex/colibri_t30/pinmux-config-colibri_t30.h new file +360 -0

360 lines not on this page · raw message

configs/colibri_t30_defconfig new file +3 -0
new file mode 100644
index 0000000..32f1d64
@@ -0,0 +1,3 @@
+CONFIG_SPL=y
++S:CONFIG_ARM=y
++S:CONFIG_TARGET_COLIBRI_T30=y
include/configs/colibri_t30.h new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
2.0.4
#1 lore raw

PATCH v2 1/1 ARM: tegra: add Colibri T30 board support

Quoted 7 lines · Stefan Agner

This adds board support for the Toradex Colibri T30 module.

Working functions:
- SD card boot
- eMMC environment and boot
- USB host/USB client (on the dual role port)
- Network (via ASIX USB)

Note that this patch is going to conflict with:
http://patchwork.ozlabs.org/patch/376287/
tegra: kconfig: move board select menu and common settings

... since that moves all the Tegra Kconfig board options into sub-menus. At some point, this or that patch will need to be rebased on the other, or merged with each-other.