mmc: tegra: fix boards that used old CONFIG_TEGRA2_MMC build switch
PATCH 1/1 mmc: tegra: fix boards that used old CONFIG_TEGRA2_MMC build switch
Some boards came in after my tegra2_mmc.* -> tegra_mmc.* change, and didn't change CONFIG_TEGRA2_MMC to CONFIG_TEGRA_MMC.
--- 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(-)
board/avionic-design/common/tamonten.c +2 -2
@@ -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)
board/compal/paz00/paz00.c +2 -2
@@ -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)
board/compulab/trimslice/trimslice.c +1 -1
@@ -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
board/nvidia/common/board.c +1 -1
@@ -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 */
include/configs/tec.h +1 -1
@@ -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 */
Signature · 1 line
1.7.0.4
PATCH 1/1 mmc: tegra: fix boards that used old CONFIG_TEGRA2_MMC build switch
Quoted 4 lines · Tom Warren
Some boards came in after my tegra2_mmc.* -> tegra_mmc.* change, and didn't change
CONFIG_TEGRA2_MMCtoCONFIG_TEGRA_MMC.Signed-off-by Tom Warren <[email protected]>
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?
PATCH 1/1 mmc: tegra: fix boards that used old CONFIG_TEGRA2_MMC build switch
Stephen,
Quoted 8 lines
-----Original Message-----
From: Stephen Warren [mailto:swarren at wwwdotorg.org]
Sent: Friday, June 01, 2012 10:49 AM
To: Tom Warren
Cc: u-boot at lists.denx.de; Tom Warren
Subject: Re: [U-Boot] [PATCH] mmc: tegra: fix boards that used oldCONFIG_TEGRA2_MMCbuild switch
Quoted 8 lines
Quoted 4 lines · Tom Warren
Some boards came in after my tegra2_mmc.* -> tegra_mmc.* change, and didn't change
CONFIG_TEGRA2_MMCtoCONFIG_TEGRA_MMC.Signed-off-by Tom Warren <[email protected]>There is also a fixup for
CONFIG_TEGRA2_SPIbelow as well as for MMC; perhaps that should be mentioned in the commit description if not subject.
Yeah, sorry. That crept in. I'll add it to the commit msg.
Quoted 6 lines
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.
True. I'll reword the commit msg.
Quoted 6 lines
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.
Tom
Signature · 1 line
nvpublic
PATCH 1/1 mmc: tegra: fix boards that used old CONFIG_TEGRA2_MMC build switch
Quoted 2 lines · Tom Warren
Stephen Warren wrote at Friday, June 01, 2012 10:49 AM:
Quoted 1 line · Tom Warren
...
Quoted 7 lines
Quoted 5 lines
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_MMCnorCONFIG_TEGRA2_SPIthat 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 theTEGRA2_MMCinstances so they should work fine.
Yeah, I guess that's true. I was grep'ing for just TEGRA2_MMC/SPI/GPIO, not CONFIG_*.