* [U-Boot] [PATCH 1/5] ARM: tegra: rename colibri_t20 configuration
2015-03-23 17:28 [U-Boot] [PATCH 0/5] rename colibri_t20 Marcel Ziswiler
@ 2015-03-23 17:28 ` Marcel Ziswiler
2015-03-23 17:28 ` [U-Boot] [PATCH 2/5] ARM: tegra: rename colibri_t20 device-tree Marcel Ziswiler
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Marcel Ziswiler @ 2015-03-23 17:28 UTC (permalink / raw)
To: u-boot
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%)
diff --git a/board/toradex/colibri_t20_iris/Kconfig b/board/toradex/colibri_t20_iris/Kconfig
index 4bf7278..cd308be 100644
--- a/board/toradex/colibri_t20_iris/Kconfig
+++ b/board/toradex/colibri_t20_iris/Kconfig
@@ -7,6 +7,6 @@ config SYS_VENDOR
default "toradex"
config SYS_CONFIG_NAME
- default "colibri_t20_iris"
+ default "colibri_t20"
endif
diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_defconfig
similarity index 100%
rename from configs/colibri_t20_iris_defconfig
rename to configs/colibri_t20_defconfig
diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20.h
similarity index 100%
rename from include/configs/colibri_t20_iris.h
rename to include/configs/colibri_t20.h
--
1.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 2/5] ARM: tegra: rename colibri_t20 device-tree
2015-03-23 17:28 [U-Boot] [PATCH 0/5] rename colibri_t20 Marcel Ziswiler
2015-03-23 17:28 ` [U-Boot] [PATCH 1/5] ARM: tegra: rename colibri_t20 configuration Marcel Ziswiler
@ 2015-03-23 17:28 ` Marcel Ziswiler
2015-03-23 17:28 ` [U-Boot] [PATCH 3/5] ARM: tegra: get rid of colibri_t20-common Marcel Ziswiler
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Marcel Ziswiler @ 2015-03-23 17:28 UTC (permalink / raw)
To: u-boot
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%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index cbe5b86..f897e6d 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -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 \
diff --git a/arch/arm/dts/tegra20-colibri_t20_iris.dts b/arch/arm/dts/tegra20-colibri.dts
similarity index 100%
rename from arch/arm/dts/tegra20-colibri_t20_iris.dts
rename to arch/arm/dts/tegra20-colibri.dts
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index a14d55a..af8e435 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -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"
--
1.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 3/5] ARM: tegra: get rid of colibri_t20-common
2015-03-23 17:28 [U-Boot] [PATCH 0/5] rename colibri_t20 Marcel Ziswiler
2015-03-23 17:28 ` [U-Boot] [PATCH 1/5] ARM: tegra: rename colibri_t20 configuration Marcel Ziswiler
2015-03-23 17:28 ` [U-Boot] [PATCH 2/5] ARM: tegra: rename colibri_t20 device-tree Marcel Ziswiler
@ 2015-03-23 17:28 ` Marcel Ziswiler
2015-03-23 19:42 ` Stephen Warren
2015-03-23 17:28 ` [U-Boot] [PATCH 4/5] ARM: tegra: rename colibri_t20 board folder Marcel Ziswiler
2015-03-23 17:28 ` [U-Boot] [PATCH 5/5] ARM: tegra: rename colibri_t20 board Marcel Ziswiler
4 siblings, 1 reply; 8+ messages in thread
From: Marcel Ziswiler @ 2015-03-23 17:28 UTC (permalink / raw)
To: u-boot
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%)
diff --git a/board/toradex/colibri_t20-common/colibri_t20-common.h b/board/toradex/colibri_t20-common/colibri_t20-common.h
deleted file mode 100644
index 1fe53f6..0000000
--- a/board/toradex/colibri_t20-common/colibri_t20-common.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (C) 2012 Lucas Stach
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-void colibri_t20_common_pin_mux_usb(void);
diff --git a/board/toradex/colibri_t20_iris/Makefile b/board/toradex/colibri_t20_iris/Makefile
index ebeac70..f286aec 100644
--- a/board/toradex/colibri_t20_iris/Makefile
+++ b/board/toradex/colibri_t20_iris/Makefile
@@ -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
diff --git a/board/toradex/colibri_t20-common/colibri_t20-common.c b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
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
--- a/board/toradex/colibri_t20-common/colibri_t20-common.c
+++ b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
@@ -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
--
1.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 3/5] ARM: tegra: get rid of colibri_t20-common
2015-03-23 17:28 ` [U-Boot] [PATCH 3/5] ARM: tegra: get rid of colibri_t20-common Marcel Ziswiler
@ 2015-03-23 19:42 ` Stephen Warren
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Warren @ 2015-03-23 19:42 UTC (permalink / raw)
To: u-boot
On 03/23/2015 11:28 AM, Marcel Ziswiler wrote:
> 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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 4/5] ARM: tegra: rename colibri_t20 board folder
2015-03-23 17:28 [U-Boot] [PATCH 0/5] rename colibri_t20 Marcel Ziswiler
` (2 preceding siblings ...)
2015-03-23 17:28 ` [U-Boot] [PATCH 3/5] ARM: tegra: get rid of colibri_t20-common Marcel Ziswiler
@ 2015-03-23 17:28 ` Marcel Ziswiler
2015-03-23 19:41 ` Stephen Warren
2015-03-23 17:28 ` [U-Boot] [PATCH 5/5] ARM: tegra: rename colibri_t20 board Marcel Ziswiler
4 siblings, 1 reply; 8+ messages in thread
From: Marcel Ziswiler @ 2015-03-23 17:28 UTC (permalink / raw)
To: u-boot
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%)
diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig
index a354e2a..e88ac16 100644
--- a/arch/arm/mach-tegra/tegra20/Kconfig
+++ b/arch/arm/mach-tegra/tegra20/Kconfig
@@ -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
diff --git a/board/toradex/colibri_t20_iris/Kconfig b/board/toradex/colibri_t20/Kconfig
similarity index 100%
rename from board/toradex/colibri_t20_iris/Kconfig
rename to board/toradex/colibri_t20/Kconfig
diff --git a/board/toradex/colibri_t20_iris/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS
similarity index 100%
rename from board/toradex/colibri_t20_iris/MAINTAINERS
rename to board/toradex/colibri_t20/MAINTAINERS
diff --git a/board/toradex/colibri_t20_iris/Makefile b/board/toradex/colibri_t20/Makefile
similarity index 100%
rename from board/toradex/colibri_t20_iris/Makefile
rename to board/toradex/colibri_t20/Makefile
diff --git a/board/toradex/colibri_t20_iris/colibri_t20_iris.c b/board/toradex/colibri_t20/colibri_t20_iris.c
similarity index 100%
rename from board/toradex/colibri_t20_iris/colibri_t20_iris.c
rename to board/toradex/colibri_t20/colibri_t20_iris.c
--
1.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH 4/5] ARM: tegra: rename colibri_t20 board folder
2015-03-23 17:28 ` [U-Boot] [PATCH 4/5] ARM: tegra: rename colibri_t20 board folder Marcel Ziswiler
@ 2015-03-23 19:41 ` Stephen Warren
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Warren @ 2015-03-23 19:41 UTC (permalink / raw)
To: u-boot
On 03/23/2015 11:28 AM, Marcel Ziswiler wrote:
> 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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 5/5] ARM: tegra: rename colibri_t20 board
2015-03-23 17:28 [U-Boot] [PATCH 0/5] rename colibri_t20 Marcel Ziswiler
` (3 preceding siblings ...)
2015-03-23 17:28 ` [U-Boot] [PATCH 4/5] ARM: tegra: rename colibri_t20 board folder Marcel Ziswiler
@ 2015-03-23 17:28 ` Marcel Ziswiler
4 siblings, 0 replies; 8+ messages in thread
From: Marcel Ziswiler @ 2015-03-23 17:28 UTC (permalink / raw)
To: u-boot
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%)
diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig
index e88ac16..7f09f81 100644
--- a/arch/arm/mach-tegra/tegra20/Kconfig
+++ b/arch/arm/mach-tegra/tegra20/Kconfig
@@ -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
diff --git a/board/toradex/colibri_t20/Kconfig b/board/toradex/colibri_t20/Kconfig
index cd308be..7f373b2 100644
--- a/board/toradex/colibri_t20/Kconfig
+++ b/board/toradex/colibri_t20/Kconfig
@@ -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"
diff --git a/board/toradex/colibri_t20/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS
index c68955b..b251c00 100644
--- a/board/toradex/colibri_t20/MAINTAINERS
+++ b/board/toradex/colibri_t20/MAINTAINERS
@@ -1,6 +1,7 @@
-COLIBRI_T20_IRIS BOARD
+COLIBRI_T20
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
+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/Makefile b/board/toradex/colibri_t20/Makefile
index f286aec..86f78d9 100644
--- a/board/toradex/colibri_t20/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/colibri_t20_iris.c b/board/toradex/colibri_t20/colibri_t20.c
similarity index 100%
rename from board/toradex/colibri_t20/colibri_t20_iris.c
rename to board/toradex/colibri_t20/colibri_t20.c
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index af8e435..8987567 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -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"
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 4888c94..e80e9ed 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -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
diff --git a/tools/buildman/README b/tools/buildman/README
index cf7bf5c..e870d54 100644
--- a/tools/buildman/README
+++ b/tools/buildman/README
@@ -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
--
1.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread