From patchwork Fri Jun 1 17:11:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 162357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 76767B6FD9 for ; Sat, 2 Jun 2012 03:12:21 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 15110281C0; Fri, 1 Jun 2012 19:12:20 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K9nJ2eIUnaVO; Fri, 1 Jun 2012 19:12:19 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AF95C281B5; Fri, 1 Jun 2012 19:12:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 420C9281B5 for ; Fri, 1 Jun 2012 19:12:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fzmXf3w-d930 for ; Fri, 1 Jun 2012 19:12:14 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pz0-f44.google.com (mail-pz0-f44.google.com [209.85.210.44]) by theia.denx.de (Postfix) with ESMTPS id 4037F281B3 for ; Fri, 1 Jun 2012 19:12:12 +0200 (CEST) Received: by dacx6 with SMTP id x6so2803222dac.3 for ; Fri, 01 Jun 2012 10:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-nvconfidentiality; bh=dhI/ETLeL+G3AZFebpdIqdg13k3vSLOIXLN4Md5c/jc=; b=Xg8eFdUCq+EH277yuuJF+WqjySs5N/KMZwdCeh6bwb8CuSFmwX4r7Kd9iRW87kwqZi wxbarJd+6dzTmECbD3w+FJT5w+SfWs0rQ73WbeeAeIfjTLpHae9EQZQ+/uot4smXD+/B tZ0n4cYECNmPyKuDuwqnowS98WMpMSK0p/hmIwE3Zn0a9AD/qJ7+aNtTJB9GDg0N1g+3 QmNz33vlt6dG0SBtUFhCC9BFErlKOhKMiiDbq9YsblP9yexpT8f+0K5K2Rh7rvpbp7QE BQ+540fs+FPWTBF+fwvkQDt9LV6ANMa+dQU9HIOaEEI/48dqfS52HD0Y2FzgV+sNRkRN b6ag== Received: by 10.68.225.101 with SMTP id rj5mr12188735pbc.2.1338570730852; Fri, 01 Jun 2012 10:12:10 -0700 (PDT) Received: from localhost.localdomain (ip68-106-253-43.ph.ph.cox.net. [68.106.253.43]) by mx.google.com with ESMTPS id jp5sm3350804pbc.2.2012.06.01.10.12.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Jun 2012 10:12:09 -0700 (PDT) From: Tom Warren To: u-boot@lists.denx.de Date: Fri, 1 Jun 2012 10:11:26 -0700 Message-Id: <1338570686-29429-1-git-send-email-twarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 X-NVConfidentiality: public Cc: Tom Warren , twarren.nvidia@gmail.com Subject: [U-Boot] [PATCH] mmc: tegra: fix boards that used old CONFIG_TEGRA2_MMC build switch X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Some boards came in after my tegra2_mmc.* -> tegra_mmc.* change, and didn't change CONFIG_TEGRA2_MMC to CONFIG_TEGRA_MMC. Signed-off-by: Tom Warren --- 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 #include -#ifdef CONFIG_TEGRA2_MMC +#ifdef CONFIG_TEGRA_MMC #include #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 #include #include -#ifdef CONFIG_TEGRA2_MMC +#ifdef CONFIG_TEGRA_MMC #include #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 #include #include -#ifdef CONFIG_TEGRA2_MMC +#ifdef CONFIG_TEGRA_MMC #include #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 */