From b315b752da508f8257e15ebf7de9750d3ed54307 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Mon, 24 Nov 2008 21:15:19 +0000 Subject: [PATCH] Simple typos and fixups. This is almost building. Signed-off-by: Ronald G. Minnich Acked-by: Ronald G. Minnich git-svn-id: svn://coreboot.org/repository/coreboot-v3@1050 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- mainboard/kontron/986lcd-m/irq_tables.h | 2 -- northbridge/intel/i945/raminit.c | 12 ++++-------- southbridge/intel/i82801gx/Makefile | 11 ++++++++++- southbridge/intel/i82801gx/smmrelocate.S | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/mainboard/kontron/986lcd-m/irq_tables.h b/mainboard/kontron/986lcd-m/irq_tables.h index 7715e077aa..8ceaeac289 100644 --- a/mainboard/kontron/986lcd-m/irq_tables.h +++ b/mainboard/kontron/986lcd-m/irq_tables.h @@ -19,8 +19,6 @@ * MA 02110-1301 USA */ -#include - const struct irq_routing_table intel_irq_routing_table = { PIRQ_SIGNATURE, /* u32 signature */ PIRQ_VERSION, /* u16 version */ diff --git a/northbridge/intel/i945/raminit.c b/northbridge/intel/i945/raminit.c index b936dfb0d4..5bbd5cb9d5 100644 --- a/northbridge/intel/i945/raminit.c +++ b/northbridge/intel/i945/raminit.c @@ -930,7 +930,7 @@ static const u8 const single_channel_slew_group_lookup[] = { DQ2330, NC, CTL3215, NC, CLK2030, CLK2030, DQ2030, CMD3210 }; -static const u32 * map(u32 *table, unsigned int i){ +static const u32 * map(const u8 *table, unsigned int i){ const u32 *p = NULL; switch(table[i]) { case NC: p = nc; break; @@ -949,8 +949,6 @@ static const u32 * map(u32 *table, unsigned int i){ static void sdram_rcomp_buffer_strength_and_slew(struct sys_info *sysinfo) { - u32 *table; - #if 0 static const u32 const * const dual_channel_slew_group_lookup[] = { dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, @@ -1072,7 +1070,7 @@ static void sdram_rcomp_buffer_strength_and_slew(struct sys_info *sysinfo) }; const u8 * strength_multiplier; - const u32* const * slew_group_lookup; + const u8* const * slew_group_lookup; int idx; /* Set Strength Multipliers */ @@ -1081,12 +1079,12 @@ static void sdram_rcomp_buffer_strength_and_slew(struct sys_info *sysinfo) if (sdram_capabilities_dual_channel()) { printk(BIOS_DEBUG, "Programming Dual Channel RCOMP\n"); strength_multiplier = dual_channel_strength_multiplier; - slew_group_lookup = dual_channel_slew_group_lookup; + slew_group_lookup = dual_channel_slew_group_lookup; idx = 5 * sysinfo->dimm[0] + sysinfo->dimm[2]; } else { printk(BIOS_DEBUG, "Programming Single Channel RCOMP\n"); strength_multiplier = single_channel_strength_multiplier; - slew_group_lookup = single_channel_slew_group_lookup; + slew_group_lookup = single_channel_slew_group_lookup; idx = 5 * sysinfo->dimm[0] + sysinfo->dimm[1]; } @@ -1105,8 +1103,6 @@ static void sdram_rcomp_buffer_strength_and_slew(struct sys_info *sysinfo) sdram_write_slew_rates(G1SRPUT, map(slew_group_lookup, idx * 8 + 0)); sdram_write_slew_rates(G2SRPUT, map(slew_group_lookup, idx * 8 + 1)); if ((map(slew_group_lookup, idx * 8 + 2) != nc) && (sysinfo->package == SYSINFO_PACKAGE_STACKED)) { - - sdram_write_slew_rates(G3SRPUT, ctl3220); } else { sdram_write_slew_rates(G3SRPUT, map(slew_group_lookup, idx * 8 + 2)); diff --git a/southbridge/intel/i82801gx/Makefile b/southbridge/intel/i82801gx/Makefile index c6521e242e..df4f1f05cf 100644 --- a/southbridge/intel/i82801gx/Makefile +++ b/southbridge/intel/i82801gx/Makefile @@ -39,8 +39,17 @@ STAGE2_CHIPSET_SRC += \ $(src)/southbridge/intel/i82801gx/libsmbus.c \ $(obj)/southbridge/intel/i82801gx/smmrelocate.o \ +ifeq ($(CONFIG_PIRQ_TABLE),y) +STAGE2_CHIPSET_SRC += $(src)/southbridge/intel/i82801gx/irq_tables.c +endif + $(obj)/southbridge/intel/i82801gx/smmrelocate.o: $(src)/southbridge/intel/i82801gx/smmrelocate.S - as -o $@ $< + $(Q)mkdir -p $(dir $@) + $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(CC) -E $(COREBOOTINCLUDE) -I$(src)/northbridge/intel/i945 $< \ + -o $(obj)/southbridge/intel/i82801gx/smmrelocate.s + $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(AS) $(obj)/southbridge/intel/i82801gx/smmrelocate.s -o $@ STAGE0_CHIPSET_SRC += \ $(src)/southbridge/intel/i82801gx/stage1_smbus.c \ diff --git a/southbridge/intel/i82801gx/smmrelocate.S b/southbridge/intel/i82801gx/smmrelocate.S index 2a7bfc23c7..0bf9235997 100644 --- a/southbridge/intel/i82801gx/smmrelocate.S +++ b/southbridge/intel/i82801gx/smmrelocate.S @@ -19,8 +19,8 @@ * MA 02110-1301 USA */ -#include -#include "../../../../src/northbridge/intel/i945/ich7.h" +#define ASSEMBLY +#include #undef DEBUG_SMM_RELOCATION //#define DEBUG_SMM_RELOCATION