diff options
author | roy zang <tie-fei.zang@freescale.com> | 2007-02-28 16:46:48 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-02-28 16:46:48 +0800 |
commit | 00b574bdc8c54dbc9e03f63c24f62955d483e3ef (patch) | |
tree | dc49c4219bafd43c2ace6c5a3e6745d7b7264194 /README | |
parent | 30bddf2c46ab2e824f217a38db033118ac4622af (diff) | |
parent | ccbc7036648e465697ca298ba51e0e76dda352a0 (diff) | |
download | u-boot-imx-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.zip u-boot-imx-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.tar.gz u-boot-imx-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.tar.bz2 |
Merge branch 'master' into hpc2
Conflicts:
drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Diffstat (limited to 'README')
-rw-r--r-- | README | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1347,6 +1347,16 @@ The following options need to be configured: If defined, then this indicates the I2C bus number for DDR SPD. If not defined, then U-Boot assumes that SPD is on I2C bus 0. + CFG_RTC_BUS_NUM + + If defined, then this indicates the I2C bus number for the RTC. + If not defined, then U-Boot assumes that RTC is on I2C bus 0. + + CFG_DTT_BUS_NUM + + If defined, then this indicates the I2C bus number for the DTT. + If not defined, then U-Boot assumes that DTT is on I2C bus 0. + CONFIG_FSL_I2C Define this option if you want to use Freescale's I2C driver in |