leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: tegra: rename colibri_t20 board/configuration/device-tree

Browse Source 
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>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Marcel Ziswiler 2015-03-26 01:31:54 +01:00 committed by Tom Warren
parent d1db97aaa4
commit e57c6e5b50
12 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/Makefile
View File

@ -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 \

0
arch/arm/dts/tegra20-colibri_t20_iris.dts → arch/arm/dts/tegra20-colibri.dts
View File

4
arch/arm/mach-tegra/tegra20/Kconfig
View File

@ -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

6
board/toradex/colibri_t20_iris/Kconfig → board/toradex/colibri_t20/Kconfig
View File

@ -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

7
board/toradex/colibri_t20/MAINTAINERS Normal file
View File

@ -0,0 +1,7 @@
COLIBRI_T20
M: Lucas Stach <dev@lynxeye.de>
S: Maintained
F: board/toradex/colibri_t20/
F: include/configs/colibri_t20.h
F: configs/colibri_t20_defconfig
F: arch/arm/dts/tegra20-colibri.dtb

2
board/toradex/colibri_t20_iris/Makefile → board/toradex/colibri_t20/Makefile
View File

@ -6,4 +6,4 @@
include $(srctree)/board/nvidia/common/common.mk
obj-y += colibri_t20_iris.o
obj-y += colibri_t20.o

0
board/toradex/colibri_t20_iris/colibri_t20_iris.c → board/toradex/colibri_t20/colibri_t20.c
View File

6
board/toradex/colibri_t20_iris/MAINTAINERS
View File

@ -1,6 +0,0 @@
COLIBRI_T20_IRIS BOARD
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

5
configs/colibri_t20_defconfig Normal file
View File

@ -0,0 +1,5 @@
CONFIG_ARM=y
CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_COLIBRI_T20=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"

5
configs/colibri_t20_iris_defconfig
View File

@ -1,5 +0,0 @@
CONFIG_ARM=y
CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_COLIBRI_T20_IRIS=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"

6
include/configs/colibri_t20_iris.h → include/configs/colibri_t20.h
View File

@ -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

2
tools/buildman/README
View File

@ -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