diff options
| author | Valentin Longchamp <valentin.longchamp@keymile.com> | 2012-06-13 03:03:52 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-07-07 14:07:33 +0200 |
| commit | dacc8c6f79aa4016e431278d31431a19d43c6b37 (patch) | |
| tree | 27b81bb9605a31dedf3b2197219463db1cd37861 | |
| parent | c59c085731571d8e04344f815fd3a25bb0f69ae1 (diff) | |
| download | u-boot-imx-dacc8c6f79aa4016e431278d31431a19d43c6b37.zip u-boot-imx-dacc8c6f79aa4016e431278d31431a19d43c6b37.tar.gz u-boot-imx-dacc8c6f79aa4016e431278d31431a19d43c6b37.tar.bz2 | |
arm/kirkwood: protect the ENV_SPI #defines
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>
| -rw-r--r-- | 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 /* |