diff options
| author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-01-24 13:45:52 -0600 |
|---|---|---|
| committer | Jonathan A. Kollasch <jakllsch@kollasch.net> | 2015-01-28 20:00:17 +0100 |
| commit | b8716879917c420d9e7e2618e48b1411a0c6bcc8 (patch) | |
| tree | d9a72ed094d7f5767b4bb21c484bcd96e41fdaac | |
| parent | 6300b034143cab98d472276054de2781eb3ce97a (diff) | |
| download | coreboot-b8716879917c420d9e7e2618e48b1411a0c6bcc8.tar.xz | |
nvidia/ck804: Add ability to override CK804 base unit ID
Change-Id: Ic1b35b6bdd9c6d9ab672242e40b73aff1d626e81
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/8273
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Jonathan A. Kollasch <jakllsch@kollasch.net>
| -rw-r--r-- | src/southbridge/nvidia/ck804/bootblock.c | 4 | ||||
| -rw-r--r-- | src/southbridge/nvidia/ck804/early_setup.c | 4 | ||||
| -rw-r--r-- | src/southbridge/nvidia/ck804/early_setup_car.c | 2 | ||||
| -rw-r--r-- | src/southbridge/nvidia/ck804/enable_usbdebug.c | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/src/southbridge/nvidia/ck804/bootblock.c b/src/southbridge/nvidia/ck804/bootblock.c index 6e68404d64..45db5cb5fe 100644 --- a/src/southbridge/nvidia/ck804/bootblock.c +++ b/src/southbridge/nvidia/ck804/bootblock.c @@ -1,6 +1,8 @@ /* * This file is part of the coreboot project. * + * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering + * * Copyright (C) 2004 Tyan Computer * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer. * @@ -20,11 +22,13 @@ #include <arch/io.h> +#ifndef CK804_DEVN_BASE #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 +#endif static void ck804_enable_rom(void) { diff --git a/src/southbridge/nvidia/ck804/early_setup.c b/src/southbridge/nvidia/ck804/early_setup.c index ecbf219597..b82c144b17 100644 --- a/src/southbridge/nvidia/ck804/early_setup.c +++ b/src/southbridge/nvidia/ck804/early_setup.c @@ -1,6 +1,8 @@ /* * This file is part of the coreboot project. * + * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering + * * Copyright (C) 2004 Tyan Computer * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer. * @@ -76,11 +78,13 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control, #define CK804_CHIP_REV 3 +#ifndef CK804_DEVN_BASE #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 +#endif #if CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY #define CK804B_DEVN_BASE 1 diff --git a/src/southbridge/nvidia/ck804/early_setup_car.c b/src/southbridge/nvidia/ck804/early_setup_car.c index 6044e3d424..c125a66336 100644 --- a/src/southbridge/nvidia/ck804/early_setup_car.c +++ b/src/southbridge/nvidia/ck804/early_setup_car.c @@ -73,11 +73,13 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control, #define CK804_CHIP_REV 3 +#ifndef CK804_DEVN_BASE #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 +#endif #if CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY #define CK804B_DEVN_BASE 1 diff --git a/src/southbridge/nvidia/ck804/enable_usbdebug.c b/src/southbridge/nvidia/ck804/enable_usbdebug.c index 97e8ecbccd..5bb16a3253 100644 --- a/src/southbridge/nvidia/ck804/enable_usbdebug.c +++ b/src/southbridge/nvidia/ck804/enable_usbdebug.c @@ -5,6 +5,7 @@ * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer. * Copyright (C) 2006,2007 AMD * Written by Yinghai Lu <yinghai.lu@amd.com> for AMD. + * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,11 +31,13 @@ #include <device/pci_def.h> #include "ck804.h" +#ifndef CK804_DEVN_BASE #if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20 #define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE #else #define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE #endif +#endif pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx) { |