| Submitter | Jonathan A. Kollasch |
|---|---|
| Date | 2010-10-27 20:13:26 |
| Message ID | <20101027201326.GH1425@tarantulon.kollasch.net> |
| Download | mbox | patch |
| Permalink | /patch/2191/ |
| State | Accepted |
| Commit | r5996 |
| Headers | show |
Comments
Jonathan A. Kollasch wrote: > Correct an apparent copy-paste error that shows up at compile time on > boards using ck804_early_setup.c that select CK804_USE_NIC. > > Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net> Acked-by: Peter Stuge <peter@stuge.se>
On Wed, Oct 27, 2010 at 10:23:28PM +0200, Peter Stuge wrote: > Jonathan A. Kollasch wrote: > > Correct an apparent copy-paste error that shows up at compile time on > > boards using ck804_early_setup.c that select CK804_USE_NIC. > > > > Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net> > > Acked-by: Peter Stuge <peter@stuge.se> r5996.
Patch
Index: src/southbridge/nvidia/ck804/ck804_early_setup.c =================================================================== --- src/southbridge/nvidia/ck804/ck804_early_setup.c (revision 5993) +++ src/southbridge/nvidia/ck804/ck804_early_setup.c (working copy) @@ -266,11 +266,11 @@ RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 8, ~(0xff), ((0 << 4) | (0 << 2) | (0 << 0)), RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 9, ~(0xff), ((0 << 4) | (1 << 2) | (1 << 0)), #if CONFIG_CK804_USE_NIC - RES_PCI_IO, PCI_ADDR(0, CK804B_DEVN_BASE +0xa, 0, 0xf8), 0xffffffbf, 0x00000040, + RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE +0xa, 0, 0xf8), 0xffffffbf, 0x00000040, RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 19, ~(0xff), ((0 << 4) | (1 << 2) | (0 << 0)), RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 3, ~(0xff), ((0 << 4) | (1 << 2) | (0 << 0)), RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 3, ~(0xff), ((0 << 4) | (1 << 2) | (1 << 0)), - RES_PCI_IO, PCI_ADDR(CK804B_BUSN, CK804B_DEVN_BASE + 1 , 0, 0xe4), ~(1 << 23), (1 << 23), + RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE + 1 , 0, 0xe4), ~(1 << 23), (1 << 23), #endif #if CONFIG_CK804_USE_ACI
Correct an apparent copy-paste error that shows up at compile time on boards using ck804_early_setup.c that select CK804_USE_NIC. Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net> ---