diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-05 20:50:39 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-05 20:50:39 +0100 |
| commit | c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d (patch) | |
| tree | da81a7a9b2616bfb0db1331089b390c7c92af247 /include/configs/eb_cpux9k2.h | |
| parent | f6723794fd8f3362c4f3b5d0f36607a6a6f107b2 (diff) | |
| parent | c12f941bece9ed79efccfe9e4a9fd977da6975f9 (diff) | |
| download | u-boot-imx-c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d.zip u-boot-imx-c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d.tar.gz u-boot-imx-c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d.tar.bz2 | |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/eb_cpux9k2.h')
| -rw-r--r-- | include/configs/eb_cpux9k2.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index b8e672f..5c2c73a 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -36,7 +36,7 @@ #define CONFIG_SYS_TEXT_BASE 0x00000000 #else #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SYS_TEXT_BASE 0x21f00000 +#define CONFIG_SYS_TEXT_BASE 0x21800000 #endif #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ #define CONFIG_STANDALONE_LOAD_ADDR 0x21000000 @@ -133,6 +133,7 @@ #define CONFIG_CMD_UBI #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_UBIFS + #define CONFIG_SYS_LONGHELP /* @@ -162,6 +163,7 @@ * Hardware drivers */ #define CONFIG_USB_ATMEL +#define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW #define CONFIG_AT91C_PQFP_UHPBUG #define CONFIG_USB_STORAGE |