* [U-Boot] [PATCH v2 1/2] ARM: tegra: get rid of colibri_t20-common
2015-03-26 0:31 [U-Boot] [PATCH v2 0/2] rename colibri_t20 Marcel Ziswiler
@ 2015-03-26 0:31 ` Marcel Ziswiler
2015-03-26 0:31 ` [U-Boot] [PATCH v2 2/2] ARM: tegra: rename colibri_t20 board/configuration/device-tree Marcel Ziswiler
2015-03-26 14:15 ` [U-Boot] [PATCH v2 0/2] rename colibri_t20 Stephen Warren
2 siblings, 0 replies; 5+ messages in thread
From: Marcel Ziswiler @ 2015-03-26 0:31 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.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
.../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
diff --git a/board/toradex/colibri_t20-common/colibri_t20-common.c b/board/toradex/colibri_t20-common/colibri_t20-common.c
deleted file mode 100644
index 58a9916..0000000
--- a/board/toradex/colibri_t20-common/colibri_t20-common.c
+++ /dev/null
@@ -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
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_iris/colibri_t20_iris.c b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
index 49c74f3..4656094 100644
--- a/board/toradex/colibri_t20_iris/colibri_t20_iris.c
+++ b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
@@ -5,23 +5,11 @@
*/
#include <common.h>
-#include <asm/gpio.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/colibri_t20-common.h"
-
-#ifdef CONFIG_USB_EHCI_TEGRA
-void pin_mux_usb(void)
-{
- colibri_t20_common_pin_mux_usb();
-
- /* USB 1 aka Tegra USB port 3 VBus*/
- pinmux_tristate_disable(PMUX_PINGRP_SPIG);
-}
-#endif
+#include <asm/gpio.h>
#ifdef CONFIG_TEGRA_MMC
/*
@@ -34,3 +22,31 @@ void pin_mux_mmc(void)
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 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);
+
+ /* USB 1 aka Tegra USB port 3 VBus */
+ pinmux_tristate_disable(PMUX_PINGRP_SPIG);
+}
+#endif
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH v2 2/2] ARM: tegra: rename colibri_t20 board/configuration/device-tree
2015-03-26 0:31 [U-Boot] [PATCH v2 0/2] rename colibri_t20 Marcel Ziswiler
2015-03-26 0:31 ` [U-Boot] [PATCH v2 1/2] ARM: tegra: get rid of colibri_t20-common Marcel Ziswiler
@ 2015-03-26 0:31 ` Marcel Ziswiler
2015-03-26 14:15 ` [U-Boot] [PATCH v2 0/2] rename colibri_t20 Stephen Warren
2 siblings, 0 replies; 5+ messages in thread
From: Marcel Ziswiler @ 2015-03-26 0:31 UTC (permalink / raw)
To: u-boot
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>
---
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%)
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/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig
index a354e2a..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
@@ -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 51%
rename from board/toradex/colibri_t20_iris/Kconfig
rename to board/toradex/colibri_t20/Kconfig
index 4bf7278..7f373b2 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_iris/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS
similarity index 24%
rename from board/toradex/colibri_t20_iris/MAINTAINERS
rename to board/toradex/colibri_t20/MAINTAINERS
index c68955b..b251c00 100644
--- a/board/toradex/colibri_t20_iris/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_iris/Makefile b/board/toradex/colibri_t20/Makefile
similarity index 81%
rename from board/toradex/colibri_t20_iris/Makefile
rename to board/toradex/colibri_t20/Makefile
index f286aec..86f78d9 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
similarity index 100%
rename from board/toradex/colibri_t20_iris/colibri_t20_iris.c
rename to board/toradex/colibri_t20/colibri_t20.c
diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_defconfig
similarity index 34%
rename from configs/colibri_t20_iris_defconfig
rename to configs/colibri_t20_defconfig
index a14d55a..8987567 100644
--- a/configs/colibri_t20_iris_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_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"
+CONFIG_TARGET_COLIBRI_T20=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20.h
similarity index 89%
rename from include/configs/colibri_t20_iris.h
rename to include/configs/colibri_t20.h
index 4888c94..e80e9ed 100644
--- a/include/configs/colibri_t20_iris.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] 5+ messages in thread* [U-Boot] [PATCH v2 0/2] rename colibri_t20
2015-03-26 0:31 [U-Boot] [PATCH v2 0/2] rename colibri_t20 Marcel Ziswiler
2015-03-26 0:31 ` [U-Boot] [PATCH v2 1/2] ARM: tegra: get rid of colibri_t20-common Marcel Ziswiler
2015-03-26 0:31 ` [U-Boot] [PATCH v2 2/2] ARM: tegra: rename colibri_t20 board/configuration/device-tree Marcel Ziswiler
@ 2015-03-26 14:15 ` Stephen Warren
2015-03-31 22:45 ` Tom Warren
2 siblings, 1 reply; 5+ messages in thread
From: Stephen Warren @ 2015-03-26 14:15 UTC (permalink / raw)
To: u-boot
On 03/25/2015 06:31 PM, Marcel Ziswiler wrote:
> 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 <swarren@nvidia.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v2 0/2] rename colibri_t20
2015-03-26 14:15 ` [U-Boot] [PATCH v2 0/2] rename colibri_t20 Stephen Warren
@ 2015-03-31 22:45 ` Tom Warren
0 siblings, 0 replies; 5+ messages in thread
From: Tom Warren @ 2015-03-31 22:45 UTC (permalink / raw)
To: u-boot
Marcel,
This series applied to u-boot-tegra/next. I'll push an update today or tomorrow to Denx.de.
Tom
> -----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:
> > 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 <swarren@nvidia.com>
-----------------------------------------------------------------------------------
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.
-----------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 5+ messages in thread