Missed some boards with my in after my tegra2_mmc.* -> tegra_mmc.* change, and one instance fo CONFIG_TEGRA2_SPI. MAKEALL -s tegra2 AOK, Seaboard MMC AOK. Didn't test Tamonten, Paz00 or TrimSlice, as I have none here.

Signed-off-by: Tom Warren twarren@nvidia.com --- board/avionic-design/common/tamonten.c | 4 ++-- board/compal/paz00/paz00.c | 4 ++-- board/compulab/trimslice/trimslice.c | 2 +- board/nvidia/common/board.c | 2 +- include/configs/tec.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c index 7c92158..6802172 100644 --- a/board/avionic-design/common/tamonten.c +++ b/board/avionic-design/common/tamonten.c @@ -37,7 +37,7 @@ #include <asm/arch/uart.h> #include <asm/arch/mmc.h>

-#ifdef CONFIG_TEGRA2_MMC +#ifdef CONFIG_TEGRA_MMC #include <mmc.h> #endif

@@ -58,7 +58,7 @@ void gpio_early_init(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/compal/paz00/paz00.c b/board/compal/paz00/paz00.c index 0c09ce0..ec67874 100644 --- a/board/compal/paz00/paz00.c +++ b/board/compal/paz00/paz00.c @@ -20,7 +20,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

@@ -32,7 +32,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/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c index 7167c91..f15fbd7 100644 --- a/board/compulab/trimslice/trimslice.c +++ b/board/compulab/trimslice/trimslice.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/board/nvidia/common/board.c b/board/nvidia/common/board.c index a159deb..fc8b928 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -94,7 +94,7 @@ int board_init(void) #ifdef CONFIG_SPI_UART_SWITCH gpio_config_uart(); #endif -#ifdef CONFIG_TEGRA2_SPI +#ifdef CONFIG_TEGRA_SPI spi_init(); #endif /* boot param addr */ diff --git a/include/configs/tec.h b/include/configs/tec.h index 1181fb5..d83c513 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -51,7 +51,7 @@ /* SD/MMC */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_TEGRA2_MMC +#define CONFIG_TEGRA_MMC #define CONFIG_CMD_MMC

/* USB host support */