Skip to contentSkip to conversation

rename colibri_t20

PATCH Superseded Marcel Ziswiler 2 participants 8 messages Mar 23, 2015

Subsystems (3)
Arm (32-bit) Arm sub-architectures Tegra architecture support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Marcel Ziswiler

author
#0 lore raw

cover rename colibri_t20

In accordance with our other modules supported by U-Boot and as agreed upon for Apalis/Colibri T30 [1] get rid of the carrier board post fix in the board/configuration/device-tree naming.

[1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/192041

Marcel Ziswiler (5):
ARM: tegra: rename colibri_t20 configuration
ARM: tegra: rename colibri_t20 device-tree
ARM: tegra: get rid of colibri_t20-common
ARM: tegra: rename colibri_t20 board folder
ARM: tegra: rename colibri_t20 board

 arch/arm/dts/Makefile                              |  2 +-
 ...20-colibri_t20_iris.dts => tegra20-colibri.dts} |  0
 arch/arm/mach-tegra/tegra20/Kconfig                |  4 +--
 .../colibri_t20-common/colibri_t20-common.h        |  7 -----
 .../{colibri_t20_iris => colibri_t20}/Kconfig      |  6 ++--
 board/toradex/colibri_t20/MAINTAINERS              |  7 +++++
 board/toradex/colibri_t20/Makefile                 |  9 ++++++
 .../colibri_t20.c}                                 | 33 +++++++++++++++-----
 board/toradex/colibri_t20_iris/MAINTAINERS         |  6 ----
 board/toradex/colibri_t20_iris/Makefile            |  9 ------
 board/toradex/colibri_t20_iris/colibri_t20_iris.c  | 36 ----------------------
 configs/colibri_t20_defconfig                      |  5 +++
 configs/colibri_t20_iris_defconfig                 |  5 ---
 .../configs/{colibri_t20_iris.h => colibri_t20.h}  |  6 ++--
 tools/buildman/README                              |  2 +-
 15 files changed, 56 insertions(+), 81 deletions(-)
 rename arch/arm/dts/{tegra20-colibri_t20_iris.dts => tegra20-colibri.dts} (100%)
 delete mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.h
 rename board/toradex/{colibri_t20_iris => colibri_t20}/Kconfig (51%)
 create mode 100644 board/toradex/colibri_t20/MAINTAINERS
 create mode 100644 board/toradex/colibri_t20/Makefile
 rename board/toradex/{colibri_t20-common/colibri_t20-common.c => colibri_t20/colibri_t20.c} (65%)
 delete mode 100644 board/toradex/colibri_t20_iris/MAINTAINERS
 delete mode 100644 board/toradex/colibri_t20_iris/Makefile
 delete mode 100644 board/toradex/colibri_t20_iris/colibri_t20_iris.c
 create mode 100644 configs/colibri_t20_defconfig
 delete mode 100644 configs/colibri_t20_iris_defconfig
 rename include/configs/{colibri_t20_iris.h => colibri_t20.h} (89%)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/5 ARM: tegra: rename colibri_t20 configuration

In accordance with our other modules supported by U-Boot and as agreed for Apalis/Colibri T30 get rid of the carrier board in the configuration naming.

---
 board/toradex/colibri_t20_iris/Kconfig                        | 2 +-
 configs/{colibri_t20_iris_defconfig => colibri_t20_defconfig} | 0
 include/configs/{colibri_t20_iris.h => colibri_t20.h}         | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename configs/{colibri_t20_iris_defconfig => colibri_t20_defconfig} (100%)
 rename include/configs/{colibri_t20_iris.h => colibri_t20.h} (100%)
board/toradex/colibri_t20_iris/Kconfig +1 -1
index 4bf7278..cd308be 100644
@@ -7,6 +7,6 @@ config SYS_VENDOR
 	default "toradex"
 
 config SYS_CONFIG_NAME
-	default "colibri_t20_iris"
+	default "colibri_t20"
 
 endif
configs/colibri_t20_defconfig renamed from configs/colibri_t20_iris_defconfig +0 -0
similarity index 100%
rename from configs/colibri_t20_iris_defconfig
rename to configs/colibri_t20_defconfig
include/configs/colibri_t20.h renamed from include/configs/colibri_t20_iris.h +0 -0
similarity index 100%
rename from include/configs/colibri_t20_iris.h
rename to include/configs/colibri_t20.h
Signature · 1 line
1.9.3
author
#2 lore raw

PATCH 2/5 ARM: tegra: rename colibri_t20 device-tree

In reply to Marcel Ziswiler

In accordance with our other modules supported by U-Boot and as agreed for Apalis/Colibri T30 get rid of the carrier board in the device-tree naming.

---
 arch/arm/dts/Makefile                                              | 2 +-
 arch/arm/dts/{tegra20-colibri_t20_iris.dts => tegra20-colibri.dts} | 0
 configs/colibri_t20_defconfig                                      | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/dts/{tegra20-colibri_t20_iris.dts => tegra20-colibri.dts} (100%)
arch/arm/dts/Makefile +1 -1
index cbe5b86..f897e6d 100644
@@ -24,7 +24,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
 	tegra20-trimslice.dtb \
 	tegra20-ventana.dtb \
 	tegra20-whistler.dtb \
-	tegra20-colibri_t20_iris.dtb \
+	tegra20-colibri.dtb \
 	tegra30-apalis.dtb \
 	tegra30-beaver.dtb \
 	tegra30-cardhu.dtb \
arch/arm/dts/tegra20-colibri.dts renamed from arch/arm/dts/tegra20-colibri_t20_iris.dts +0 -0
similarity index 100%
rename from arch/arm/dts/tegra20-colibri_t20_iris.dts
rename to arch/arm/dts/tegra20-colibri.dts
configs/colibri_t20_defconfig +1 -1
index a14d55a..af8e435 100644
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_COLIBRI_T20_IRIS=y
-CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
Signature · 1 line
1.9.3
author
#3 lore raw

PATCH 3/5 ARM: tegra: get rid of colibri_t20-common

In reply to Marcel Ziswiler

As a preparatory step to renaming the board folder as well first get rid of the colibri_t20-common after having integrated it into colibri_t20_iris for now.

While at it also migrate to using NVIDIA's common.mk magic.

---
 .../colibri_t20-common/colibri_t20-common.h        |  7 -----
 board/toradex/colibri_t20_iris/Makefile            |  4 +--
 .../colibri_t20_iris.c}                            | 33 ++++++++++++++++------
 3 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.h
 rename board/toradex/{colibri_t20-common/colibri_t20-common.c => colibri_t20_iris/colibri_t20_iris.c} (65%)
board/toradex/colibri_t20-common/colibri_t20-common.h deleted +0 -7
deleted file mode 100644
index 1fe53f6..0000000
@@ -1,7 +0,0 @@
-/*
- *  Copyright (C) 2012 Lucas Stach
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-void colibri_t20_common_pin_mux_usb(void);
board/toradex/colibri_t20_iris/Makefile +2 -2
index ebeac70..f286aec 100644
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y	:= ../../nvidia/common/board.o
-obj-y	+= ../colibri_t20-common/colibri_t20-common.o
+include $(srctree)/board/nvidia/common/common.mk
+
 obj-y	+= colibri_t20_iris.o
board/toradex/colibri_t20_iris/colibri_t20_iris.c renamed from board/toradex/colibri_t20-common/colibri_t20-common.c +25 -8
similarity index 65%
rename from board/toradex/colibri_t20-common/colibri_t20-common.c
rename to board/toradex/colibri_t20_iris/colibri_t20_iris.c
index 58a9916..4656094 100644
@@ -9,27 +9,44 @@
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/board.h>
+#include <asm/gpio.h>
 
-#include "colibri_t20-common.h"
+#ifdef CONFIG_TEGRA_MMC
+/*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+void pin_mux_mmc(void)
+{
+	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
+	pinmux_tristate_disable(PMUX_PINGRP_GMB);
+}
+#endif
+
+#ifdef CONFIG_TEGRA_NAND
+void pin_mux_nand(void)
+{
+	funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_NDFLASH_KBC_8_BIT);
+}
+#endif
 
 #ifdef CONFIG_USB_EHCI_TEGRA
-void colibri_t20_common_pin_mux_usb(void)
+void pin_mux_usb(void)
 {
 	/* module internal USB bus to connect ethernet chipset */
 	funcmux_select(PERIPH_ID_USB2, FUNCMUX_USB2_ULPI);
+
 	/* ULPI reference clock output */
 	pinmux_set_func(PMUX_PINGRP_CDEV2, PMUX_FUNC_PLLP_OUT4);
 	pinmux_tristate_disable(PMUX_PINGRP_CDEV2);
+
 	/* PHY reset GPIO */
 	pinmux_tristate_disable(PMUX_PINGRP_UAC);
+
 	/* VBus GPIO */
 	pinmux_tristate_disable(PMUX_PINGRP_DTE);
-}
-#endif
 
-#ifdef CONFIG_TEGRA_NAND
-void pin_mux_nand(void)
-{
-	funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_NDFLASH_KBC_8_BIT);
+	/* USB 1 aka Tegra USB port 3 VBus */
+	pinmux_tristate_disable(PMUX_PINGRP_SPIG);
 }
 #endif
Signature · 1 line
1.9.3
author
#5 lore raw

PATCH 4/5 ARM: tegra: rename colibri_t20 board folder

In reply to Marcel Ziswiler

In accordance with our other modules supported by U-Boot and as agreed for Apalis/Colibri T30 get rid of the carrier board in the board folder naming.

Please note that this temporarily breaks the build as Kconfig within this folder will require changing as well.

---
 arch/arm/mach-tegra/tegra20/Kconfig                                | 2 +-
 board/toradex/{colibri_t20_iris => colibri_t20}/Kconfig            | 0
 board/toradex/{colibri_t20_iris => colibri_t20}/MAINTAINERS        | 0
 board/toradex/{colibri_t20_iris => colibri_t20}/Makefile           | 0
 board/toradex/{colibri_t20_iris => colibri_t20}/colibri_t20_iris.c | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/Kconfig (100%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/MAINTAINERS (100%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/Makefile (100%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/colibri_t20_iris.c (100%)
arch/arm/mach-tegra/tegra20/Kconfig +1 -1
index a354e2a..e88ac16 100644
@@ -47,6 +47,6 @@ source "board/avionic-design/tec/Kconfig"
 source "board/compulab/trimslice/Kconfig"
 source "board/nvidia/ventana/Kconfig"
 source "board/nvidia/whistler/Kconfig"
-source "board/toradex/colibri_t20_iris/Kconfig"
+source "board/toradex/colibri_t20/Kconfig"
 
 endif
board/toradex/colibri_t20/Kconfig renamed from board/toradex/colibri_t20_iris/Kconfig +0 -0
similarity index 100%
rename from board/toradex/colibri_t20_iris/Kconfig
rename to board/toradex/colibri_t20/Kconfig
board/toradex/colibri_t20/MAINTAINERS renamed from board/toradex/colibri_t20_iris/MAINTAINERS +0 -0
similarity index 100%
rename from board/toradex/colibri_t20_iris/MAINTAINERS
rename to board/toradex/colibri_t20/MAINTAINERS
board/toradex/colibri_t20/Makefile renamed from board/toradex/colibri_t20_iris/Makefile +0 -0
similarity index 100%
rename from board/toradex/colibri_t20_iris/Makefile
rename to board/toradex/colibri_t20/Makefile
board/toradex/colibri_t20/colibri_t20_iris.c renamed from board/toradex/colibri_t20_iris/colibri_t20_iris.c +0 -0
similarity index 100%
rename from board/toradex/colibri_t20_iris/colibri_t20_iris.c
rename to board/toradex/colibri_t20/colibri_t20_iris.c
Signature · 1 line
1.9.3
author
#7 lore raw

PATCH 5/5 ARM: tegra: rename colibri_t20 board

In reply to Marcel Ziswiler

In accordance with our other modules supported by U-Boot and as agreed for Apalis/Colibri T30 get rid of the carrier board in the board naming.

While at it also bring the prompt more in line with our other products.

---
 arch/arm/mach-tegra/tegra20/Kconfig                             | 2 +-
 board/toradex/colibri_t20/Kconfig                               | 4 ++--
 board/toradex/colibri_t20/MAINTAINERS                           | 9 +++++----
 board/toradex/colibri_t20/Makefile                              | 2 +-
 board/toradex/colibri_t20/{colibri_t20_iris.c => colibri_t20.c} | 0
 configs/colibri_t20_defconfig                                   | 2 +-
 include/configs/colibri_t20.h                                   | 6 +++---
 tools/buildman/README                                           | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)
 rename board/toradex/colibri_t20/{colibri_t20_iris.c => colibri_t20.c} (100%)
arch/arm/mach-tegra/tegra20/Kconfig +1 -1
index e88ac16..7f09f81 100644
@@ -30,7 +30,7 @@ config TARGET_VENTANA
 config TARGET_WHISTLER
 	bool "NVIDIA Tegra20 Whistler evaluation board"
 
-config TARGET_COLIBRI_T20_IRIS
+config TARGET_COLIBRI_T20
 	bool "Toradex Colibri T20 board"
 
 endchoice
board/toradex/colibri_t20/Kconfig +2 -2
index cd308be..7f373b2 100644
@@ -1,7 +1,7 @@
-if TARGET_COLIBRI_T20_IRIS
+if TARGET_COLIBRI_T20
 
 config SYS_BOARD
-	default "colibri_t20_iris"
+	default "colibri_t20"
 
 config SYS_VENDOR
 	default "toradex"
board/toradex/colibri_t20/MAINTAINERS +5 -4
index c68955b..b251c00 100644
@@ -1,6 +1,7 @@
-COLIBRI_T20_IRIS BOARD
+COLIBRI_T20
 M:	Lucas Stach <[email protected]>
 S:	Maintained
-F:	board/toradex/colibri_t20_iris/
-F:	include/configs/colibri_t20_iris.h
-F:	configs/colibri_t20_iris_defconfig
+F:	board/toradex/colibri_t20/
+F:	include/configs/colibri_t20.h
+F:	configs/colibri_t20_defconfig
+F:	arch/arm/dts/tegra20-colibri.dtb
board/toradex/colibri_t20/Makefile +1 -1
index f286aec..86f78d9 100644
@@ -6,4 +6,4 @@
 
 include $(srctree)/board/nvidia/common/common.mk
 
-obj-y	+= colibri_t20_iris.o
+obj-y	+= colibri_t20.o
board/toradex/colibri_t20/colibri_t20.c renamed from board/toradex/colibri_t20/colibri_t20_iris.c +0 -0
similarity index 100%
rename from board/toradex/colibri_t20/colibri_t20_iris.c
rename to board/toradex/colibri_t20/colibri_t20.c
configs/colibri_t20_defconfig +1 -1
index af8e435..8987567 100644
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
-CONFIG_TARGET_COLIBRI_T20_IRIS=y
+CONFIG_TARGET_COLIBRI_T20=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
include/configs/colibri_t20.h +3 -3
index 4888c94..e80e9ed 100644
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012 Lucas Stach
+ * Copyright (C) 2012 Lucas Stach
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */

@@ -10,8 +10,8 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT                   "Tegra20 (Colibri) # "
-#define CONFIG_TEGRA_BOARD_STRING  "Toradex Colibri T20 on Iris"
+#define V_PROMPT			"Colibri T20 # "
+#define CONFIG_TEGRA_BOARD_STRING	"Toradex Colibri T20"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
tools/buildman/README +1 -1
index cf7bf5c..e870d54 100644
@@ -613,7 +613,7 @@ $ ./tools/buildman/buildman -b us-mem4 -sSdB
                  run_list_real                             1996    2000      +4
                  do_nandboot                                760     756      -4
                  do_mem_crc                                 168      68    -100
-            colibri_t20_iris:  all -9  rodata -29  text +20
+            colibri_t20    :  all -9  rodata -29  text +20
                u-boot: add: 1/0, grow: 2/-3 bytes: 140/-112 (28)
                  function                                   old     new   delta
                  hash_command                                80     160     +80
Signature · 1 line
1.9.3
#6 lore raw

PATCH 4/5 ARM: tegra: rename colibri_t20 board folder

In reply to Marcel Ziswiler
Quoted 6 lines · Marcel Ziswiler

In accordance with our other modules supported by U-Boot and as agreed for Apalis/Colibri T30 get rid of the carrier board in the board folder naming.

Please note that this temporarily breaks the build as Kconfig within this folder will require changing as well.

Conceptually this series seems fine to me, but I'd recommend squashing some/all of the patches together in order to avoid any intermediate breakage and "git bisect" issues.

#4 lore raw

PATCH 3/5 ARM: tegra: get rid of colibri_t20-common

In reply to Marcel Ziswiler
Quoted 5 lines · Marcel Ziswiler

As a preparatory step to renaming the board folder as well first get rid of the colibri_t20-common after having integrated it into colibri_t20_iris for now.

While at it also migrate to using NVIDIA's common.mk magic.

Is it possible to separate the removal of colibri_t20-common into a separate commit from the renames, so that the two are lumped together.

I'd rather expect this series to have two commits:

1) Remove colibri_t20-common and move the C code into the board file.

2) Everything related to the rename.