From e46c1c85c90b6d263f951ab745a9fadd93041111 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 15 Apr 2010 23:01:59 +0000 Subject: remove more warnings. move ROOT_COMPLEX selection to fam10 Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5447 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/amd/amdfam10/Kconfig | 1 + src/northbridge/amd/amdfam10/amdfam10_conf.c | 12 ++++++++---- src/northbridge/amd/amdfam10/northbridge.c | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'src/northbridge/amd/amdfam10') diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig index 8e72c656fe..dd893f6bf8 100644 --- a/src/northbridge/amd/amdfam10/Kconfig +++ b/src/northbridge/amd/amdfam10/Kconfig @@ -21,6 +21,7 @@ config NORTHBRIDGE_AMD_AMDFAM10 bool select HAVE_HIGH_TABLES select HYPERTRANSPORT_PLUGIN_SUPPORT + select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX config AGP_APERTURE_SIZE hex diff --git a/src/northbridge/amd/amdfam10/amdfam10_conf.c b/src/northbridge/amd/amdfam10/amdfam10_conf.c index df578044a6..567790cede 100644 --- a/src/northbridge/amd/amdfam10/amdfam10_conf.c +++ b/src/northbridge/amd/amdfam10/amdfam10_conf.c @@ -152,7 +152,7 @@ static u32 get_DctSelBaseAddr(u32 i) return sel_m; } - +#ifdef UNUSED_CODE static void set_DctSelHiEn(u32 i, u32 val) { device_t dev; @@ -168,6 +168,7 @@ static void set_DctSelHiEn(u32 i, u32 val) pci_write_config32(dev, DRAM_CTRL_SEL_LOW, dcs_lo); } +#endif static u32 get_DctSelHiEn(u32 i) { @@ -200,6 +201,7 @@ static void set_DctSelBaseOffset(u32 i, u32 sel_off_m) } +#ifdef UNUSED_CODE static u32 get_DctSelBaseOffset(u32 i) { device_t dev; @@ -215,6 +217,8 @@ static u32 get_DctSelBaseOffset(u32 i) sel_off_m = dcs_hi>>(20+DCSH_DctSelBaseOffset_47_26_SHIFT-26); return sel_off_m; } +#endif + #if CONFIG_AMDMCT == 0 static u32 get_one_DCT(struct mem_info *meminfo) @@ -231,9 +235,8 @@ static u32 get_one_DCT(struct mem_info *meminfo) return one_DCT; } -#endif #if CONFIG_HW_MEM_HOLE_SIZEK != 0 - +// See that other copy in northbridge.c static u32 hoist_memory(u32 hole_startk, u32 i, u32 one_DCT, u32 nodes) { u32 ii; @@ -313,7 +316,8 @@ static u32 hoist_memory(u32 hole_startk, u32 i, u32 one_DCT, u32 nodes) return carry_over; } -#endif +#endif +#endif // CONFIG_AMDMCT #if CONFIG_EXT_CONF_SUPPORT diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index ab7be4e9e6..76d85f6c3c 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -795,7 +795,8 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void) return mem_hole; } - +// WHY this check? CONFIG_AMDMCT is enabled on all Fam10 boards. +// Does it make sense not to? #if CONFIG_AMDMCT == 0 static void disable_hoist_memory(unsigned long hole_startk, int i) { -- cgit v1.2.3