From facf0b93615bb0b5680ef80dcf1680bec337d69f Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 3 Feb 2015 08:04:32 +0200 Subject: Revert "nvidia/ck804: Add ability to override CK804 base unit ID" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/8338 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc --- src/southbridge/nvidia/ck804/bootblock.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/southbridge/nvidia/ck804/bootblock.c') diff --git a/src/southbridge/nvidia/ck804/bootblock.c b/src/southbridge/nvidia/ck804/bootblock.c index 45db5cb5fe..6e68404d64 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 -#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) { -- cgit v1.2.3