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