diff options
author | Wolfgang Denk <wd@denx.de> | 2010-01-17 23:08:42 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-01-17 23:08:42 +0100 |
commit | 3e3989619f5ed3ee28002d985f3da28540586ab9 (patch) | |
tree | d4434455cafdc0c750aa26e642949232ffd0b2d3 /include/configs/bf537-stamp.h | |
parent | 64917ca38933d10b3763f61df7a1e58e1e127b52 (diff) | |
parent | 846a6391e4bc9fdd721753a1021953ff0ca17c27 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'include/configs/bf537-stamp.h')
-rw-r--r-- | include/configs/bf537-stamp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 74b9ecd0b0..de2add7595 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -113,7 +113,7 @@ #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS) #define ENV_IS_EMBEDDED #else -#define ENV_IS_EMBEDDED_CUSTOM +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR #endif #ifdef ENV_IS_EMBEDDED /* WARNING - the following is hand-optimized to fit within @@ -145,7 +145,7 @@ * SPI_MMC Settings */ #define CONFIG_MMC -#define CONFIG_BFIN_SPI_MMC +#define CONFIG_SPI_MMC /* |