Skip to contentSkip to conversation

rename colibri_t20

PATCH New Marcel Ziswiler 3 participants 5 messages Mar 26, 2015 – Mar 31, 2015

Subsystems (3)
Arm (32-bit) Arm sub-architectures Tegra architecture support
lore
Share & tools
lore

Marcel Ziswiler

author
#0 lore raw

v2 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

Changes in v2:
- squashed it all together into two patches as suggested by Stephen in order to avoid any intermediate breakage and "git bisect" issues
- added my previously missing signed-off-by

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

 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.c        | 35 -------------
 .../colibri_t20-common/colibri_t20-common.h        |  7 -----
 .../{colibri_t20_iris => colibri_t20}/Kconfig      |  6 ++--
 .../{colibri_t20_iris => colibri_t20}/MAINTAINERS  |  9 +++---
 .../{colibri_t20_iris => colibri_t20}/Makefile     |  6 ++--
 .../colibri_t20.c}                                 | 33 +++++++++++++++-----
 ...ri_t20_iris_defconfig => colibri_t20_defconfig} |  4 +--
 .../configs/{colibri_t20_iris.h => colibri_t20.h}  |  6 ++--
 tools/buildman/README                              |  2 +-
 12 files changed, 45 insertions(+), 105 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.c
 delete mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.h
 rename board/toradex/{colibri_t20_iris => colibri_t20}/Kconfig (51%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/MAINTAINERS (24%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/Makefile (39%)
 rename board/toradex/{colibri_t20_iris/colibri_t20_iris.c => colibri_t20/colibri_t20.c} (65%)
 rename configs/{colibri_t20_iris_defconfig => colibri_t20_defconfig} (34%)
 rename include/configs/{colibri_t20_iris.h => colibri_t20.h} (89%)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH v2 1/2 ARM: tegra: get rid of colibri_t20-common

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.

Signed-off-by Marcel Ziswiler <[email protected]>
---
 .../colibri_t20-common/colibri_t20-common.c        | 35 ------------------
 .../colibri_t20-common/colibri_t20-common.h        |  7 ----
 board/toradex/colibri_t20_iris/Makefile            |  4 +--
 board/toradex/colibri_t20_iris/colibri_t20_iris.c  | 42 +++++++++++++++-------
 4 files changed, 31 insertions(+), 57 deletions(-)
 delete mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.c
 delete mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.h
board/toradex/colibri_t20-common/colibri_t20-common.c deleted +0 -35
deleted file mode 100644
index 58a9916..0000000
@@ -1,35 +0,0 @@
-/*
- *  Copyright (C) 2012 Lucas Stach
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/funcmux.h>
-#include <asm/arch/pinmux.h>
-#include <asm/arch-tegra/board.h>
-
-#include "colibri_t20-common.h"
-
-#ifdef CONFIG_USB_EHCI_TEGRA
-void colibri_t20_common_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);
-}
-#endif
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 +29 -13

55 lines not on this page · raw message

Signature · 1 line
1.9.3
author
#2 lore raw

PATCH v2 2/2 ARM: tegra: rename colibri_t20 board/configuration/device-tree

In reply to Marcel Ziswiler

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 <[email protected]>
---
 arch/arm/dts/Makefile                                            | 2 +-
 .../dts/{tegra20-colibri_t20_iris.dts => tegra20-colibri.dts}    | 0
 arch/arm/mach-tegra/tegra20/Kconfig                              | 4 ++--
 board/toradex/{colibri_t20_iris => colibri_t20}/Kconfig          | 6 +++---
 board/toradex/{colibri_t20_iris => colibri_t20}/MAINTAINERS      | 9 +++++----
 board/toradex/{colibri_t20_iris => colibri_t20}/Makefile         | 2 +-
 .../colibri_t20_iris.c => colibri_t20/colibri_t20.c}             | 0
 configs/{colibri_t20_iris_defconfig => colibri_t20_defconfig}    | 4 ++--
 include/configs/{colibri_t20_iris.h => colibri_t20.h}            | 6 +++---
 tools/buildman/README                                            | 2 +-
 10 files changed, 18 insertions(+), 17 deletions(-)
 rename arch/arm/dts/{tegra20-colibri_t20_iris.dts => tegra20-colibri.dts} (100%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/Kconfig (51%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/MAINTAINERS (24%)
 rename board/toradex/{colibri_t20_iris => colibri_t20}/Makefile (81%)
 rename board/toradex/{colibri_t20_iris/colibri_t20_iris.c => colibri_t20/colibri_t20.c} (100%)
 rename configs/{colibri_t20_iris_defconfig => colibri_t20_defconfig} (34%)
 rename include/configs/{colibri_t20_iris.h => colibri_t20.h} (89%)
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
arch/arm/mach-tegra/tegra20/Kconfig +2 -2
index a354e2a..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

@@ -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 +3 -3
similarity index 51%
rename from board/toradex/colibri_t20_iris/Kconfig
rename to board/toradex/colibri_t20/Kconfig
index 4bf7278..7f373b2 100644
@@ -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
board/toradex/colibri_t20/MAINTAINERS renamed from board/toradex/colibri_t20_iris/MAINTAINERS +5 -4
similarity index 24%
rename from board/toradex/colibri_t20_iris/MAINTAINERS
rename to board/toradex/colibri_t20/MAINTAINERS
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 renamed from board/toradex/colibri_t20_iris/Makefile +1 -1
similarity index 81%
rename from board/toradex/colibri_t20_iris/Makefile
rename to board/toradex/colibri_t20/Makefile
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_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.c
configs/colibri_t20_defconfig renamed from configs/colibri_t20_iris_defconfig +2 -2
similarity index 34%
rename from configs/colibri_t20_iris_defconfig
rename to configs/colibri_t20_defconfig
index a14d55a..8987567 100644
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
-CONFIG_TARGET_COLIBRI_T20_IRIS=y
-CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"
+CONFIG_TARGET_COLIBRI_T20=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
include/configs/colibri_t20.h renamed from include/configs/colibri_t20_iris.h +3 -3
similarity index 89%
rename from include/configs/colibri_t20_iris.h
rename to include/configs/colibri_t20.h
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
#4 lore raw

v2 cover rename colibri_t20

Marcel,

This series applied to u-boot-tegra/next. I'll push an update today or tomorrow to Denx.de.

Tom

Quoted 10 lines

-----Original Message-----
From: Stephen Warren [mailto:swarren at wwwdotorg.org]
Sent: Thursday, March 26, 2015 7:15 AM
To: Marcel Ziswiler
Cc: u-boot at lists.denx.de; Marek Vasut; Akshay Saraswat; Fabio Estevam; Tom Rini; Pavel Machek; Michal Simek; Masahiro Yamada; Tom Warren; Hyungwon Hwang; Stephen Warren; Stefan Roese
Subject: Re: [U-Boot] [PATCH v2 0/2] rename colibri_t20

On 03/25/2015 06:31 PM, Marcel Ziswiler wrote:

Quoted 8 lines
Quoted 5 lines

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

The series,

Acked-by Stephen Warren <[email protected]>

-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------