[coreboot-gerrit] Patch set updated for coreboot: 7bd32d7 Revert "nvidia/ck804: Add ability to override CK804 base unit ID"

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8338

-gerrit

commit 7bd32d73006797fcce136683f22859180bd396dd
Author: Kyösti Mälkki 
Date:   Tue Feb 3 08:04:32 2015 +0200

Revert "nvidia/ck804: Add ability to override CK804 base unit ID"

This reverts commit b8716879917c420d9e7e2618e48b1411a0c6bcc8.

Use of #ifndef here makes it error-prone and hides errors.

Change-Id: I13a999250c80adedb6b3fd4963a862ff106750f0
    Signed-off-by: Kyösti Mälkki 
---
 src/southbridge/nvidia/ck804/bootblock.c       | 4 ----
 src/southbridge/nvidia/ck804/early_setup.c     | 4 ----
 src/southbridge/nvidia/ck804/early_setup_car.c | 2 --
 src/southbridge/nvidia/ck804/enable_usbdebug.c | 3 ---
 4 files changed, 13 deletions(-)

diff --git a/src/southbridge/nvidia/ck804/bootblock.c b/src/southbridge/nvidia/ck804/bootblock.c
index 45db5cb..6e68404 100644
--- a/src/southbridge/nvidia/ck804/bootblock.c
+++ b/src/southbridge/nvidia/ck804/bootblock.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2015 Timothy Pearson , Raptor Engineering
- *
  * Copyright (C) 2004 Tyan Computer
  * Written by Yinghai Lu  for Tyan Computer.
  *
@@ -22,13 +20,11 @@

#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 b82c144..ecbf219 100644
--- a/src/southbridge/nvidia/ck804/early_setup.c
+++ b/src/southbridge/nvidia/ck804/early_setup.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2015 Timothy Pearson , Raptor Engineering
- *
  * Copyright (C) 2004 Tyan Computer
  * Written by Yinghai Lu  for Tyan Computer.
  *
@@ -78,13 +76,11 @@ 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 c125a66..6044e3d 100644
--- a/src/southbridge/nvidia/ck804/early_setup_car.c
+++ b/src/southbridge/nvidia/ck804/early_setup_car.c
@@ -73,13 +73,11 @@ 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 5bb16a3..97e8ecb 100644
--- a/src/southbridge/nvidia/ck804/enable_usbdebug.c
+++ b/src/southbridge/nvidia/ck804/enable_usbdebug.c
@@ -5,7 +5,6 @@
  * Written by Yinghai Lu  for Tyan Computer.
  * Copyright (C) 2006,2007 AMD
  * Written by Yinghai Lu  for AMD.
- * Copyright (C) 2015 Timothy Pearson , 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
@@ -31,13 +30,11 @@
 #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)
 {