| Submitter | Holger Brunck |
|---|---|
| Date | June 13, 2012, 1:03 p.m. |
| Message ID | <1339592632-16159-1-git-send-email-holger.brunck@keymile.com> |
| Download | mbox | patch |
| Permalink | /patch/164672/ |
| State | Accepted |
| Headers | show |
Comments
> -----Original Message----- > From: Holger Brunck [mailto:holger.brunck@keymile.com] > Sent: 13 June 2012 18:34 > To: u-boot@lists.denx.de > Cc: Valentin Longchamp; Holger Brunck; Prafulla Wadaskar > Subject: [PATCH] arm/kirkwood: protect the ENV_SPI #defines > > From: Valentin Longchamp <valentin.longchamp@keymile.com> > > So that they can be redefined by some boards specific values. > > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> > Signed-off-by: Holger Brunck <holger.brunck@keymile.com> > cc: Prafulla Wadaskar <prafulla@marvell.com> > --- > Hi Prafulla, > here is the only common kirkwood related change from our patch serie, > as discussed on the ml. > > arch/arm/include/asm/arch-kirkwood/config.h | 12 +++++++++--- > 1 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/include/asm/arch-kirkwood/config.h > b/arch/arm/include/asm/arch-kirkwood/config.h > index 91164eb..a9499b7 100644 > --- a/arch/arm/include/asm/arch-kirkwood/config.h > +++ b/arch/arm/include/asm/arch-kirkwood/config.h > @@ -82,9 +82,15 @@ > #ifdef CONFIG_CMD_SF > #define CONFIG_HARD_SPI 1 > #define CONFIG_KIRKWOOD_SPI 1 > -#define CONFIG_ENV_SPI_BUS 0 > -#define CONFIG_ENV_SPI_CS 0 > -#define CONFIG_ENV_SPI_MAX_HZ 50000000 /*50Mhz */ > +#ifndef CONFIG_ENV_SPI_BUS > +# define CONFIG_ENV_SPI_BUS 0 > +#endif > +#ifndef CONFIG_ENV_SPI_CS > +# define CONFIG_ENV_SPI_CS 0 > +#endif > +#ifndef CONFIG_ENV_SPI_MAX_HZ > +# define CONFIG_ENV_SPI_MAX_HZ 50000000 > +#endif > #endif Applied to u-boot-marvell.git master branch Regards... Prafulla . . .
Patch
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index 91164eb..a9499b7 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -82,9 +82,15 @@ #ifdef CONFIG_CMD_SF #define CONFIG_HARD_SPI 1 #define CONFIG_KIRKWOOD_SPI 1 -#define CONFIG_ENV_SPI_BUS 0 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 50000000 /*50Mhz */ +#ifndef CONFIG_ENV_SPI_BUS +# define CONFIG_ENV_SPI_BUS 0 +#endif +#ifndef CONFIG_ENV_SPI_CS +# define CONFIG_ENV_SPI_CS 0 +#endif +#ifndef CONFIG_ENV_SPI_MAX_HZ +# define CONFIG_ENV_SPI_MAX_HZ 50000000 +#endif #endif /*