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