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_car.c | |
| parent | facf0b93615bb0b5680ef80dcf1680bec337d69f (diff) | |
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_car.c')
| -rw-r--r-- | src/southbridge/nvidia/ck804/early_setup_car.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/southbridge/nvidia/ck804/early_setup_car.c b/src/southbridge/nvidia/ck804/early_setup_car.c index 6044e3d424..2df3434c7f 100644 --- a/src/southbridge/nvidia/ck804/early_setup_car.c +++ b/src/southbridge/nvidia/ck804/early_setup_car.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "ck804.h" + #if !IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDK8) /* Someone messed up and snuck in some K8-specific code */ static int set_ht_link_buffer_counts_chain(uint8_t ht_c_num, unsigned vendorid, unsigned val) { return 0; /* stub */}; @@ -73,18 +75,6 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control, #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(unsigned ck804_num, unsigned *busn, unsigned *io_base) { |