sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit b871687991.

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

Change-Id: I13a999250c80adedb6b3fd4963a862ff106750f0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8338
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Kyösti Mälkki
2015-02-03 08:04:32 +02:00
parent 2af1e4402b
commit facf0b9361
4 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/southbridge/nvidia/ck804/bootblock.c
View File

@@ -1,8 +1,6 @@
/* /*
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering
*
* Copyright (C) 2004 Tyan Computer * Copyright (C) 2004 Tyan Computer
* Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer. * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer.
* *
@@ -22,13 +20,11 @@
#include <arch/io.h> #include <arch/io.h>
#ifndef CK804_DEVN_BASE
#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE #if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE
#else #else
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE
#endif #endif
#endif
static void ck804_enable_rom(void) static void ck804_enable_rom(void)
{ {

4
src/southbridge/nvidia/ck804/early_setup.c
View File

@@ -1,8 +1,6 @@
/* /*
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering
*
* Copyright (C) 2004 Tyan Computer * Copyright (C) 2004 Tyan Computer
* Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer. * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer.
* *
@@ -78,13 +76,11 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control,
#define CK804_CHIP_REV 3 #define CK804_CHIP_REV 3
#ifndef CK804_DEVN_BASE
#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE #if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE
#else #else
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE
#endif #endif
#endif
#if CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY #if CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY
#define CK804B_DEVN_BASE 1 #define CK804B_DEVN_BASE 1

2
src/southbridge/nvidia/ck804/early_setup_car.c
View File

@@ -73,13 +73,11 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control,
#define CK804_CHIP_REV 3 #define CK804_CHIP_REV 3
#ifndef CK804_DEVN_BASE
#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE #if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE
#else #else
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE
#endif #endif
#endif
#if CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY #if CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY
#define CK804B_DEVN_BASE 1 #define CK804B_DEVN_BASE 1

3
src/southbridge/nvidia/ck804/enable_usbdebug.c
View File

@@ -5,7 +5,6 @@
* Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer. * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer.
* Copyright (C) 2006,2007 AMD * Copyright (C) 2006,2007 AMD
* Written by Yinghai Lu <yinghai.lu@amd.com> for 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 * 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 * it under the terms of the GNU General Public License as published by
@@ -31,13 +30,11 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include "ck804.h" #include "ck804.h"
#ifndef CK804_DEVN_BASE
#if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20 #if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_END_UNITID_BASE
#else #else
#define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE #define CK804_DEVN_BASE CONFIG_HT_CHAIN_UNITID_BASE
#endif #endif
#endif
pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx) pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx)
{ {