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/early_setup.c | |
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/early_setup.c')
-rw-r--r-- | src/southbridge/nvidia/ck804/early_setup.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/southbridge/nvidia/ck804/early_setup.c b/src/southbridge/nvidia/ck804/early_setup.c index ecbf219597..b93c07c9fb 100644 --- a/src/southbridge/nvidia/ck804/early_setup.c +++ b/src/southbridge/nvidia/ck804/early_setup.c @@ -19,6 +19,7 @@ */ #include <reset.h> +#include "ck804.h" static int set_ht_link_ck804(u8 ht_c_num) { @@ -66,28 +67,8 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control, * 16 4 :4 */ -#if CONFIG_CK804_NUM > 1 -#define CK804B_ANACTRL_IO_BASE (ANACTRL_IO_BASE + 0x8000) -#define CK804B_SYSCTRL_IO_BASE (SYSCTRL_IO_BASE + 0x8000) -#ifndef CK804B_BUSN -#define CK804B_BUSN 0x80 -#endif -#endif - #define CK804_CHIP_REV 3 -#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 - -#if CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY -#define CK804B_DEVN_BASE 1 -#else -#define CK804B_DEVN_BASE CK804_DEVN_BASE -#endif - static void ck804_early_set_port(void) { static const unsigned int ctrl_devport_conf[] = { |