From 9bdb460a97e87b11167ef22ec2fb737ecb95aa41 Mon Sep 17 00:00:00 2001 From: Eric Biederman Date: Mon, 1 Sep 2003 23:17:58 +0000 Subject: - Updates to config.g so that it works more reliably and has initial support for paths - Renamed some configuration variables SMP -> CONFIG_SMP MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS - Removed some dead configuration variables MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS SMP -> CONFIG_SMP FINAL_MAINBOARD_FIXUP SIO_BASE SIO_SYSTEM_CLK_INPUT NO_KEYBOARD USE_NORMAL_IMAGE SERIAL_CONSOLE USE_ELF_BOOT ENABLE_FIXED_AND_VARIABLE_MTRRS START_CPU_SEG DISABLE_WATCHDOG ENABLE_IOMMU AMD8111_DEV - Removed some assembly files that are no longer needed killed src/southbridge/amd/amd8111/smbus.inc killed src/southbrideg/amd/amd8111/cmos_boot_failover.inc killed src/ram/ramtest.inc - Updates to config.g so that it works more reliably and has initial support for paths - Renamed some configuration variables SMP -> CONFIG_SMP MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS - Removed some dead configuration variables MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS SMP -> CONFIG_SMP FINAL_MAINBOARD_FIXUP SIO_BASE SIO_SYSTEM_CLK_INPUT NO_KEYBOARD USE_NORMAL_IMAGE SERIAL_CONSOLE USE_ELF_BOOT ENABLE_FIXED_AND_VARIABLE_MTRRS START_CPU_SEG DISABLE_WATCHDOG ENABLE_IOMMU AMD8111_DEV - Removed some assembly files that are no longer needed killed src/southbridge/amd/amd8111/smbus.inc killed src/southbrideg/amd/amd8111/cmos_boot_failover.inc killed src/ram/ramtest.inc killed src/sdram/generic_dump_spd.inc killed src/sdram/generic_dump_spd.inc - Updated the arima/hdama to build with the new configuration system - Updated config.g to list all of the variables with make echo git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1093 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/amd/amdk8/coherent_ht.c | 12 ++++++------ src/northbridge/amd/amdk8/raminit.c | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/northbridge/amd') diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c index baf3781bf5..5eb127c402 100644 --- a/src/northbridge/amd/amdk8/coherent_ht.c +++ b/src/northbridge/amd/amdk8/coherent_ht.c @@ -157,7 +157,7 @@ static void enable_routing(u8 node) print_debug(" done.\r\n"); } -#if MAX_CPUS > 1 +#if CONFIG_MAX_CPUS > 1 static void rename_temp_node(u8 node) { @@ -290,7 +290,7 @@ static void setup_remote_node(u8 node, u8 cpus) #endif -#if MAX_CPUS > 2 +#if CONFIG_MAX_CPUS > 2 static void setup_temp_node(u8 node, u8 cpus) { u8 row; @@ -306,7 +306,7 @@ static u8 setup_uniprocessor(void) return 1; } -#if MAX_CPUS > 1 +#if CONFIG_MAX_CPUS > 1 static u8 setup_smp(void) { u8 cpus=2; @@ -332,7 +332,7 @@ static u8 setup_smp(void) clear_temp_row(0); /* delete temporary connection */ -#if MAX_CPUS > 2 +#if CONFIG_MAX_CPUS > 2 cpus=4; /* Setup and check temporary connection from Node 0 to Node 2 */ @@ -386,7 +386,7 @@ static u8 setup_smp(void) } #endif -#if MAX_CPUS > 1 +#if CONFIG_MAX_CPUS > 1 static unsigned detect_mp_capabilities(unsigned cpus) { unsigned node, row, mask; @@ -479,7 +479,7 @@ static int setup_coherent_ht_domain(void) enable_bsp_routing(); -#if MAX_CPUS == 1 +#if CONFIG_MAX_CPUS == 1 cpus=setup_uniprocessor(); #else cpus=setup_smp(); diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c index 99318aa3f7..802e4318b4 100644 --- a/src/northbridge/amd/amdk8/raminit.c +++ b/src/northbridge/amd/amdk8/raminit.c @@ -1,6 +1,8 @@ #include #include "raminit.h" +#define ENABLE_IOMMU 1 + /* Function 2 */ #define DRAM_CSBASE 0x40 #define DRAM_CSMASK 0x60 -- cgit v1.2.3