On Tue, May 22, 2012 at 2:44 PM, Tom Warren <twarren.nvi...@gmail.com>wrote:
> In anticipation of Tegra3 support, continue removing/renaming
> Tegra2-specific files. No functional changes (yet).
> Updated copyrights to 2012.
>
> Signed-off-by: Tom Warren <twar...@nvidia.com>
>
Acked-by: Simon Glass <s...@chromium.org>
> ---
> board/nvidia/harmony/harmony.c | 4 ++--
> board/nvidia/seaboard/seaboard.c | 4 ++--
> board/nvidia/whistler/whistler.c | 2 +-
> drivers/mmc/Makefile | 2 +-
> drivers/mmc/{tegra2_mmc.c => tegra_mmc.c} | 4 ++--
> drivers/mmc/{tegra2_mmc.h => tegra_mmc.h} | 8 ++++----
> include/configs/harmony.h | 2 +-
> include/configs/medcom.h | 2 +-
> include/configs/paz00.h | 2 +-
> include/configs/plutux.h | 2 +-
> include/configs/seaboard.h | 2 +-
> include/configs/trimslice.h | 2 +-
> include/configs/ventana.h | 2 +-
> include/configs/whistler.h | 2 +-
> 14 files changed, 20 insertions(+), 20 deletions(-)
> rename drivers/mmc/{tegra2_mmc.c => tegra_mmc.c} (99%)
> rename drivers/mmc/{tegra2_mmc.h => tegra_mmc.h} (97%)
>
> diff --git a/board/nvidia/harmony/harmony.c
> b/board/nvidia/harmony/harmony.c
> index 8f8e7bf..f27ad37 100644
> --- a/board/nvidia/harmony/harmony.c
> +++ b/board/nvidia/harmony/harmony.c
> @@ -29,7 +29,7 @@
> #include <asm/arch/pinmux.h>
> #include <asm/arch/mmc.h>
> #include <asm/gpio.h>
> -#ifdef CONFIG_TEGRA2_MMC
> +#ifdef CONFIG_TEGRA_MMC
> #include <mmc.h>
> #endif
>
> @@ -41,7 +41,7 @@ void gpio_config_uart(void)
> {
> }
>
> -#ifdef CONFIG_TEGRA2_MMC
> +#ifdef CONFIG_TEGRA_MMC
> /*
> * Routine: pin_mux_mmc
> * Description: setup the pin muxes/tristate values for the SDMMC(s)
> diff --git a/board/nvidia/seaboard/seaboard.c
> b/board/nvidia/seaboard/seaboard.c
> index 94efb1e..36039c4 100644
> --- a/board/nvidia/seaboard/seaboard.c
> +++ b/board/nvidia/seaboard/seaboard.c
> @@ -29,7 +29,7 @@
> #include <asm/arch/pinmux.h>
> #include <asm/arch/mmc.h>
> #include <asm/gpio.h>
> -#ifdef CONFIG_TEGRA2_MMC
> +#ifdef CONFIG_TEGRA_MMC
> #include <mmc.h>
> #endif
>
> @@ -54,7 +54,7 @@ void gpio_config_uart(void)
> }
> #endif
>
> -#ifdef CONFIG_TEGRA2_MMC
> +#ifdef CONFIG_TEGRA_MMC
> /*
> * Routine: pin_mux_mmc
> * Description: setup the pin muxes/tristate values for the SDMMC(s)
> diff --git a/board/nvidia/whistler/whistler.c
> b/board/nvidia/whistler/whistler.c
> index 1c2f33f..3ec24df 100644
> --- a/board/nvidia/whistler/whistler.c
> +++ b/board/nvidia/whistler/whistler.c
> @@ -30,7 +30,7 @@
> #include <asm/arch/pinmux.h>
> #include <asm/arch/mmc.h>
> #include <asm/gpio.h>
> -#ifdef CONFIG_TEGRA2_MMC
> +#ifdef CONFIG_TEGRA_MMC
> #include <mmc.h>
> #endif
>
> diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
> index c245352..8c9aeb8 100644
> --- a/drivers/mmc/Makefile
> +++ b/drivers/mmc/Makefile
> @@ -42,7 +42,7 @@ COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o
> COBJS-$(CONFIG_S5P_MMC) += s5p_mmc.o
> COBJS-$(CONFIG_SDHCI) += sdhci.o
> COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o
> -COBJS-$(CONFIG_TEGRA2_MMC) += tegra2_mmc.o
> +COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
>
> COBJS := $(COBJS-y)
> SRCS := $(COBJS:.o=.c)
> diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra_mmc.c
> similarity index 99%
> rename from drivers/mmc/tegra2_mmc.c
> rename to drivers/mmc/tegra_mmc.c
> index fb8a57d..29bf583 100644
> --- a/drivers/mmc/tegra2_mmc.c
> +++ b/drivers/mmc/tegra_mmc.c
> @@ -2,7 +2,7 @@
> * (C) Copyright 2009 SAMSUNG Electronics
> * Minkyu Kang <mk7.k...@samsung.com>
> * Jaehoon Chung <jh80.ch...@samsung.com>
> - * Portions Copyright 2011 NVIDIA Corporation
> + * Portions Copyright 2011-2012 NVIDIA Corporation
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License as published by
> @@ -25,7 +25,7 @@
> #include <asm/io.h>
> #include <asm/arch/clk_rst.h>
> #include <asm/arch/clock.h>
> -#include "tegra2_mmc.h"
> +#include "tegra_mmc.h"
>
> /* support 4 mmc hosts */
> struct mmc mmc_dev[4];
> diff --git a/drivers/mmc/tegra2_mmc.h b/drivers/mmc/tegra_mmc.h
> similarity index 97%
> rename from drivers/mmc/tegra2_mmc.h
> rename to drivers/mmc/tegra_mmc.h
> index 67c00db..f9cdcaa 100644
> --- a/drivers/mmc/tegra2_mmc.h
> +++ b/drivers/mmc/tegra_mmc.h
> @@ -1,7 +1,7 @@
> /*
> * (C) Copyright 2009 SAMSUNG Electronics
> * Minkyu Kang <mk7.k...@samsung.com>
> - * Portions Copyright (C) 2011 NVIDIA Corporation
> + * Portions Copyright (C) 2011-2012 NVIDIA Corporation
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License as published by
> @@ -19,8 +19,8 @@
> *
> */
>
> -#ifndef __TEGRA2_MMC_H_
> -#define __TEGRA2_MMC_H_
> +#ifndef __TEGRA_MMC_H_
> +#define __TEGRA_MMC_H_
>
> #define TEGRA2_SDMMC1_BASE 0xC8000000
> #define TEGRA2_SDMMC2_BASE 0xC8000200
> @@ -128,4 +128,4 @@ struct mmc_host {
> };
>
> #endif /* __ASSEMBLY__ */
> -#endif /* __TEGRA2_MMC_H_ */
> +#endif /* __TEGRA_MMC_H_ */
> diff --git a/include/configs/harmony.h b/include/configs/harmony.h
> index 88189be..d13ead9 100644
> --- a/include/configs/harmony.h
> +++ b/include/configs/harmony.h
> @@ -55,7 +55,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/medcom.h b/include/configs/medcom.h
> index eecfa50..d3d1055 100644
> --- a/include/configs/medcom.h
> +++ b/include/configs/medcom.h
> @@ -45,7 +45,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/paz00.h b/include/configs/paz00.h
> index f8bd7dc..0b93226 100644
> --- a/include/configs/paz00.h
> +++ b/include/configs/paz00.h
> @@ -42,7 +42,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/plutux.h b/include/configs/plutux.h
> index 1888276..e73be0b 100644
> --- a/include/configs/plutux.h
> +++ b/include/configs/plutux.h
> @@ -45,7 +45,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
> index 6bbea30..a40f2eb 100644
> --- a/include/configs/seaboard.h
> +++ b/include/configs/seaboard.h
> @@ -86,7 +86,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
> index dafca5e..a6f9f54 100644
> --- a/include/configs/trimslice.h
> +++ b/include/configs/trimslice.h
> @@ -58,7 +58,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/ventana.h b/include/configs/ventana.h
> index 8e95db1..19e2e58 100644
> --- a/include/configs/ventana.h
> +++ b/include/configs/ventana.h
> @@ -49,7 +49,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> diff --git a/include/configs/whistler.h b/include/configs/whistler.h
> index 6c0c77e..05b2425 100644
> --- a/include/configs/whistler.h
> +++ b/include/configs/whistler.h
> @@ -58,7 +58,7 @@
> /* SD/MMC */
> #define CONFIG_MMC
> #define CONFIG_GENERIC_MMC
> -#define CONFIG_TEGRA2_MMC
> +#define CONFIG_TEGRA_MMC
> #define CONFIG_CMD_MMC
>
> #define CONFIG_DOS_PARTITION
> --
> 1.7.0.4
>
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
