diff options
author | Tom Rini <trini@ti.com> | 2014-09-26 13:51:18 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-09-26 13:51:18 (GMT) |
commit | 2c3dc792b6df16970077c0d64085e29f1f85d4c8 (patch) | |
tree | 6540d2da40e3f10db89245fe8602470e85237c9e /include/configs/B4860QDS.h | |
parent | f9860cf081efdf32c8a01b9fc271fe55e2a79f8d (diff) | |
parent | 039b77396abb0ed78af34dadbd0786dfaf0e6aa9 (diff) | |
download | u-boot-2c3dc792b6df16970077c0d64085e29f1f85d4c8.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/configs/B4860QDS.h')
-rw-r--r-- | include/configs/B4860QDS.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 953d06b..9063c57 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -227,6 +227,7 @@ unsigned long get_board_ddr_clk(void); #endif /* EEPROM */ +#define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 @@ -819,9 +820,16 @@ unsigned long get_board_ddr_clk(void); #define __USB_PHY_TYPE ulpi +#ifdef CONFIG_PPC_B4860 +#define HWCONFIG "hwconfig=fsl_ddr:ctlr_intlv=null," \ + "bank_intlv=cs0_cs1;" \ + "en_cpc:cpc2;" +#else +#define HWCONFIG "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=cs0_cs1;" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:ctlr_intlv=null," \ - "bank_intlv=cs0_cs1;" \ + HWCONFIG \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ |