diff options
Diffstat (limited to 'src/southbridge/nvidia/ck804/ck804_early_setup.c')
| -rw-r--r-- | src/southbridge/nvidia/ck804/ck804_early_setup.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/southbridge/nvidia/ck804/ck804_early_setup.c b/src/southbridge/nvidia/ck804/ck804_early_setup.c index b73c735e49..53d35feecc 100644 --- a/src/southbridge/nvidia/ck804/ck804_early_setup.c +++ b/src/southbridge/nvidia/ck804/ck804_early_setup.c @@ -56,16 +56,15 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control, #define SYSCTRL_REG_POS 0x64 /* + * Values for CONFIG_CK804_PCI_E_X and CONFIG_CK804B_PCI_E_X. + * Apparently some sort of lane configuration. + * * 16 1 1 2 :0 * 8 8 2 2 :1 * 8 8 4 :2 * 8 4 4 4 :3 * 16 4 :4 -*/ - -#ifndef CK804_PCI_E_X -#define CK804_PCI_E_X 4 -#endif + */ #if CONFIG_CK804_NUM > 1 #define CK804B_ANACTRL_IO_BASE (ANACTRL_IO_BASE + 0x8000) @@ -73,9 +72,6 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control, #ifndef CK804B_BUSN #define CK804B_BUSN 0x80 #endif -#ifndef CK804B_PCI_E_X -#define CK804B_PCI_E_X 4 -#endif #endif #define CK804_CHIP_REV 3 @@ -258,9 +254,9 @@ static void ck804_early_setup(void) RES_PORT_IO_32, ANACTRL_IO_BASE + 0x80, ~(1 << 3), 0x00000000, - RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CK804_PCI_E_X << 4) | (1 << 8), + RES_PORT_IO_32, ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CONFIG_CK804_PCI_E_X << 4) | (1 << 8), #if CONFIG_CK804_NUM > 1 - RES_PORT_IO_32, CK804B_ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CK804B_PCI_E_X << 4) | (1 << 8), + RES_PORT_IO_32, CK804B_ANACTRL_IO_BASE + 0xcc, ~((7 << 4) | (1 << 8)), (CONFIG_CK804B_PCI_E_X << 4) | (1 << 8), #endif RES_PORT_IO_8, SYSCTRL_IO_BASE + 0xc0 + 8, ~(0xff), ((0 << 4) | (0 << 2) | (0 << 0)), |