diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-02-03 08:05:55 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-02-16 23:14:02 +0100 |
| commit | 413e3da8c039360079c0c6a93f28456d0d80ff76 (patch) | |
| tree | a614af76dbe7e4d28a058378a6cff0d47409fe13 /src/southbridge/nvidia/ck804/ck804.h | |
| parent | facf0b93615bb0b5680ef80dcf1680bec337d69f (diff) | |
| download | coreboot-413e3da8c039360079c0c6a93f28456d0d80ff76.tar.xz | |
nvidia/ck804: Fix redundant configuration defines
All code must agree on PCI enumeration for the CK804 device,
define these only once. The definition in enable_usbdebug.c was
different and was assumed incorrect.
Change-Id: I7d25c145afbad41db81a6b9b4f3956ad50fcb9f2
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8339
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src/southbridge/nvidia/ck804/ck804.h')
| -rw-r--r-- | src/southbridge/nvidia/ck804/ck804.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/southbridge/nvidia/ck804/ck804.h b/src/southbridge/nvidia/ck804/ck804.h index 7ec57a4d2f..f26c56309b 100644 --- a/src/southbridge/nvidia/ck804/ck804.h +++ b/src/southbridge/nvidia/ck804/ck804.h @@ -21,10 +21,18 @@ #ifndef SOUTHBRIDGE_NVIDIA_CK804_CK804_H #define SOUTHBRIDGE_NVIDIA_CK804_CK804_H -#include "chip.h" +#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE +#define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE +#else +#define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE +#endif -void ck804_enable(device_t dev); +#define CK804B_BUSN 0x80 +#define CK804B_DEVN_BASE (!CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY ? CK804_DEVN_BASE : 1) -extern struct pci_operations ck804_pci_ops; +#if CONFIG_CK804_NUM > 1 +#define CK804B_ANACTRL_IO_BASE (ANACTRL_IO_BASE + 0x8000) +#define CK804B_SYSCTRL_IO_BASE (SYSCTRL_IO_BASE + 0x8000) +#endif #endif |