projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/master
[platform/kernel/u-boot.git]
/
include
/
configs
/
PMC405DE.h
diff --git
a/include/configs/PMC405DE.h
b/include/configs/PMC405DE.h
index
5232745
..
2c048dd
100644
(file)
--- a/
include/configs/PMC405DE.h
+++ b/
include/configs/PMC405DE.h
@@
-164,6
+164,8
@@
#define CONFIG_SYS_PCI_PTM2MS 0xff000001 /* 16MB, enable=1 */
#define CONFIG_SYS_PCI_PTM2PCI 0x04000000 /* Host: use this pci address */
#define CONFIG_SYS_PCI_PTM2MS 0xff000001 /* 16MB, enable=1 */
#define CONFIG_SYS_PCI_PTM2PCI 0x04000000 /* Host: use this pci address */
+#define CONFIG_PCI_4xx_PTM_OVERWRITE 1 /* overwrite PTMx settings by env */
+
/*
* For booting Linux, the board info and command line data
* have to be in the first 8 MB of memory, since this is
/*
* For booting Linux, the board info and command line data
* have to be in the first 8 MB of memory, since this is
@@
-213,6
+215,7
@@
* I2C EEPROM (24W16) for environment
*/
#define CONFIG_HARD_I2C /* I2c with hardware support */
* I2C EEPROM (24W16) for environment
*/
#define CONFIG_HARD_I2C /* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C /* use PPC4xx driver */
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
#define CONFIG_SYS_I2C_SLAVE 0x7F