diff options
| author | Tom Rix <Tom.Rix@windriver.com> | 2010-01-18 08:08:32 -0600 |
|---|---|---|
| committer | Tom Rix <Tom.Rix@windriver.com> | 2010-01-18 08:08:32 -0600 |
| commit | a7709d926dbc7cb1541034fcf2b21ce3e838cb12 (patch) | |
| tree | 72c58261577bc00d98dbd208e4fa95dfbb2487a5 /include/configs/bf561-ezkit.h | |
| parent | 1c2a8e359ebbec0dbef62f5b54c72f9cd72ccd59 (diff) | |
| parent | 88ffb2665cd066b6b20cfaade13929d4e8428dde (diff) | |
| download | u-boot-imx-a7709d926dbc7cb1541034fcf2b21ce3e838cb12.zip u-boot-imx-a7709d926dbc7cb1541034fcf2b21ce3e838cb12.tar.gz u-boot-imx-a7709d926dbc7cb1541034fcf2b21ce3e838cb12.tar.bz2 | |
Merge branch 't-ml-master' into t-master
Diffstat (limited to 'include/configs/bf561-ezkit.h')
| -rw-r--r-- | include/configs/bf561-ezkit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index a1fa80b..8ab38bb 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -87,7 +87,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 |