Merge branch 'mpc83xx'

This commit is contained in:
Kumar Gala 2006-01-23 16:24:29 -06:00
commit 27afa7d966
2 changed files with 5 additions and 2 deletions

View file

@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Fixed defines for MPC83xx SICRL register to match current specs
Patch by Kumar Gala, 23 Jan 2006
* Fixed PCI indirect config ops to handle multiple PCI controllers * Fixed PCI indirect config ops to handle multiple PCI controllers
We need to adjust the bus number we are trying to access based We need to adjust the bus number we are trying to access based
on which PCI controller its on on which PCI controller its on

View file

@ -71,8 +71,8 @@ typedef struct sysconf8349 {
| SPCR_TSEC2DP | SPCR_TSEC2BDP | SPCR_TSEC2EP) | SPCR_TSEC2DP | SPCR_TSEC2BDP | SPCR_TSEC2EP)
u32 sicrl; /* System General Purpose Register Low */ u32 sicrl; /* System General Purpose Register Low */
#define SICRL_LDP_A 0x80000000 #define SICRL_LDP_A 0x80000000
#define SICRL_USB0 0x40000000 #define SICRL_USB1 0x40000000
#define SICRL_USB1 0x20000000 #define SICRL_USB0 0x20000000
#define SICRL_UART 0x0C000000 #define SICRL_UART 0x0C000000
#define SICRL_GPIO1_A 0x02000000 #define SICRL_GPIO1_A 0x02000000
#define SICRL_GPIO1_B 0x01000000 #define SICRL_GPIO1_B 0x01000000