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/cm-bf537u.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/cm-bf537u.h')
| -rw-r--r-- | include/configs/cm-bf537u.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index d1870a8..c1179b0 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -96,7 +96,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 @@ -131,6 +131,10 @@ #define CONFIG_MISC_INIT_R #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE 0 +#define CONFIG_BOOTCOMMAND "run flashboot" +#define FLASHBOOT_ENV_SETTINGS \ + "flashboot=flread 20040000 1000000 280000;" \ + "bootm 0x1000000\0" /* @@ -138,13 +142,4 @@ */ #include <configs/bfin_adi_common.h> -#undef CONFIG_BOOTCOMMAND -#define CONFIG_BOOTCOMMAND "run flashboot" - -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ - NAND_ENV_SETTINGS \ - NETWORK_ENV_SETTINGS \ - "flashboot=flread 20040000 1000000 280000; bootm 0x1000000\0" - #endif |