Patchwork [U-Boot] mmc: tegra: fix boards that used old CONFIG_TEGRA2_MMC build switch

login
register
mail settings
Submitter Tom Warren
Date June 1, 2012, 5:11 p.m.
Message ID <1338570686-29429-1-git-send-email-twarren@nvidia.com>
Download mbox | patch
Permalink /patch/162357/
State Superseded
Headers show

Comments

Tom Warren - June 1, 2012, 5:11 p.m.
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 <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(-)
Stephen Warren - June 1, 2012, 5:49 p.m.
On 06/01/2012 11:11 AM, Tom Warren wrote:
> 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 <twarren@nvidia.com>

There is also a fixup for CONFIG_TEGRA2_SPI below as well as for MMC;
perhaps that should be mentioned in the commit description if not subject.

It's not quite accurate to say that the boards came in after the rename;
many of the instances below were things that got applied before the
rename in git history and should really have been part of the rename
patch, even if the patches were possibly posted to the mailing list
after the rename patch was posted, but before being applied.

Grep'ing for the symbols that got renamed in the current
u-boot-tegra/next still shows a lot of hits. For MMC those are all
include guards so it probably doesn't cause bugs. For SPI, there are
some #defines in the driver that didn't get converted.. Should those
fixes be included in this patch too?
Stephen Warren - June 1, 2012, 7 p.m.
On 06/01/2012 12:09 PM, Tom Warren wrote:
> Stephen Warren wrote at Friday, June 01, 2012 10:49 AM:
>> On 06/01/2012 11:11 AM, Tom Warren wrote:
...
>> Grep'ing for the symbols that got renamed in the current u-boot-tegra/next
>> still shows a lot of hits. For MMC those are all include guards so it
>> probably doesn't cause bugs. For SPI, there are some #defines in the driver
>> that didn't get converted.. Should those fixes be included in this patch
>> too?
>
> Current (as of right now) u-boot-tegra/next (which is where this patch lives) doesn't have any instances of CONFIG_TEGRA2_MMC nor CONFIG_TEGRA2_SPI that I can find. Were you using an older /next?  All T20 boards build fine from /next w/MAKEALL -s tegra2. I can't test MMC on the Tamonten/Paz00/etc. boards since I don't have any, but I believe I've fixed all the TEGRA2_MMC instances so they should work fine.

Yeah, I guess that's true. I was grep'ing for just TEGRA2_MMC/SPI/GPIO,
not CONFIG_*.

Patch

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 */