[commit] r6514 - trunk/src/northbridge/amd/amdk8

[repository service]

Author: stepan
Date: Tue Apr 19 02:36:39 2011
New Revision: 6514
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6514

Log:
cleanup wrong use of defined() after exporting all variables in Kconfig

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/northbridge/amd/amdk8/incoherent_ht.c
   trunk/src/northbridge/amd/amdk8/raminit.c

Modified: trunk/src/northbridge/amd/amdk8/incoherent_ht.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/incoherent_ht.c	Tue Apr 19 01:51:12 2011	(r6513)
+++ trunk/src/northbridge/amd/amdk8/incoherent_ht.c	Tue Apr 19 02:36:39 2011	(r6514)
@@ -7,10 +7,6 @@
 #include <device/pci_ids.h>
 #include <device/hypertransport_def.h>

-#ifndef CONFIG_K8_HT_FREQ_1G_SUPPORT
-	#define CONFIG_K8_HT_FREQ_1G_SUPPORT 0
-#endif
-
 // Do we need allocate MMIO? Current We direct last 64M to sblink only, We can not lose access to last 4M range to ROM
 #ifndef K8_ALLOCATE_MMIO_RANGE
    #define K8_ALLOCATE_MMIO_RANGE 0
@@ -568,7 +564,7 @@
    return reset_needed;
 }

-#if defined(CONFIG_SOUTHBRIDGE_NVIDIA_CK804) // || defined(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55)
+#if CONFIG_SOUTHBRIDGE_NVIDIA_CK804 // || CONFIG_SOUTHBRIDGE_NVIDIA_MCP55
 static int set_ht_link_buffer_count(uint8_t node, uint8_t linkn, uint8_t linkt, unsigned val)
 {
    uint32_t dword;

Modified: trunk/src/northbridge/amd/amdk8/raminit.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/raminit.c	Tue Apr 19 01:51:12 2011	(r6513)
+++ trunk/src/northbridge/amd/amdk8/raminit.c	Tue Apr 19 02:36:39 2011	(r6514)
@@ -1165,7 +1165,7 @@
    if (unbuffered) {
    	if ((has_dualch) && (!is_cpu_pre_d0())) {
    		dcl |= DCL_UnBuffDimm;
-#if defined(CONFIG_CPU_AMD_SOCKET_939) && CONFIG_CPU_AMD_SOCKET_939
+#if CONFIG_CPU_AMD_SOCKET_939
    		if ((cpuid_eax(1) & 0x30) == 0x30) {
    			/* CS[7:4] is copy of CS[3:0], should be set for 939 socket */
    			dcl |= DCL_UpperCSMap;
@@ -1389,7 +1389,7 @@
    [NBCAP_MEMCLK_100MHZ] = 0xa0, /* 10ns */
 };

-#if defined(CONFIG_CPU_AMD_SOCKET_939) && CONFIG_CPU_AMD_SOCKET_939
+#if CONFIG_CPU_AMD_SOCKET_939

/* return the minimum cycle time and set 2T accordingly */
 static unsigned int spd_dimm_loading_socket939(const struct mem_controller *ctrl, long dimm_mask) {
@@ -1511,14 +1511,14 @@
    return dloading_cycle_time;
 }

-#endif /* #if defined(CONFIG_CPU_AMD_SOCKET_939) */
+#endif /* #if CONFIG_CPU_AMD_SOCKET_939 */

static struct spd_set_memclk_result spd_set_memclk(const struct mem_controller *ctrl, long dimm_mask)
 {
    /* Compute the minimum cycle time for these dimms */
    struct spd_set_memclk_result result;
    unsigned min_cycle_time, min_latency, bios_cycle_time;
-#if defined(CONFIG_CPU_AMD_SOCKET_939)
+#if CONFIG_CPU_AMD_SOCKET_939
    unsigned dloading_cycle_time;
 #endif
    int i;
@@ -1674,7 +1674,7 @@
 #endif
 #endif

-#if defined(CONFIG_CPU_AMD_SOCKET_939) && CONFIG_CPU_AMD_SOCKET_939
+#if CONFIG_CPU_AMD_SOCKET_939
    dloading_cycle_time = spd_dimm_loading_socket939(ctrl, dimm_mask);
    if (dloading_cycle_time > min_cycle_time) {
    	min_cycle_time = dloading_cycle_time;