diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-07 22:19:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-07 22:19:49 +0200 |
| commit | f91506e28387fece392b5dd3bb3aa309e4ce7e4d (patch) | |
| tree | 3e46227d94b7b379341fba534df5aa3dd3948f68 /include | |
| parent | 5549d22b656550d36b2cc46743c7220ab0e9dcc4 (diff) | |
| parent | 2df0e6fc6b71448e1752e4ce1d5577d8977f3e5e (diff) | |
| download | talos-obmc-uboot-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.tar.gz talos-obmc-uboot-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.zip | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/APC405.h | 1 | ||||
| -rw-r--r-- | include/configs/corenet_ds.h | 2 | ||||
| -rw-r--r-- | include/configs/edminiv2.h | 11 | ||||
| -rw-r--r-- | include/configs/km_arm.h | 8 | ||||
| -rw-r--r-- | include/configs/ve8313.h | 1 | ||||
| -rw-r--r-- | include/ppc440.h | 1 |
6 files changed, 15 insertions, 9 deletions
diff --git a/include/configs/APC405.h b/include/configs/APC405.h index 20849bc685..a7724adb42 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -104,6 +104,7 @@ #define CONFIG_NET_MULTI 1 #undef CONFIG_HAS_ETH1 +#define CONFIG_PPC4xx_EMAC #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 0 /* PHY address */ #define CONFIG_LXT971_NO_SLEEP 1 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index dd609da8f0..3dcee85d8e 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -124,7 +124,7 @@ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) +#define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) #define CONFIG_DDR_SPD #define CONFIG_FSL_DDR3 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 57dd1651f3..ccfc66053b 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -132,6 +132,7 @@ */ #include <config_cmd_default.h> #define CONFIG_CMD_IDE +#define CONFIG_CMD_I2C /* * Network @@ -182,6 +183,16 @@ #endif /* CMD_IDE */ /* + * I2C related stuff + */ +#ifdef CONFIG_CMD_I2C +#define CONFIG_I2C_MVTWSI +#define CONFIG_I2C_MVTWSI_BASE ORION5X_TWSI_BASE +#define CONFIG_SYS_I2C_SLAVE 0x0 +#define CONFIG_SYS_I2C_SPEED 100000 +#endif + +/* * Environment variables configurations */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index 6519c9042c..1617e697de 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -142,16 +142,8 @@ /* * I2C related stuff */ -#undef CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SOFT_I2C /* I2C bit-banged */ -#if defined(CONFIG_HARD_I2C) -#define CONFIG_I2C_KIRKWOOD -#define CONFIG_I2C_KW_REG_BASE KW_TWSI_BASE -#define CONFIG_SYS_I2C_SLAVE 0x0 -#define CONFIG_SYS_I2C_SPEED 100000 -#endif - #define CONFIG_KIRKWOOD_GPIO /* Enable GPIO Support */ #if defined(CONFIG_SOFT_I2C) #ifndef __ASSEMBLY__ diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 1589913a5e..56d24f9014 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -39,6 +39,7 @@ #define CONFIG_VE8313 1 #define CONFIG_PCI 1 +#define CONFIG_FSL_ELBC 1 #define CONFIG_BOARD_EARLY_INIT_F 1 diff --git a/include/ppc440.h b/include/ppc440.h index c807dda2ae..67277539a4 100644 --- a/include/ppc440.h +++ b/include/ppc440.h @@ -1711,6 +1711,7 @@ #if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #define CPR0_ICFG_RLI_MASK 0x80000000 +#define CPR0_ICFG_ICS_MASK 0x00000007 #define CPR0_SPCID_SPCIDV0_MASK 0x03000000 #define CPR0_SPCID_SPCIDV0_DIV1 0x01000000 #define CPR0_SPCID_SPCIDV0_DIV2 0x02000000 |
