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/mainboard/newisys/khepri/Config.lb | 28 ++++------------------------ src/mainboard/newisys/khepri/auto.c | 2 ++ src/mainboard/newisys/khepri/mainboard.c | 2 +- 3 files changed, 7 insertions(+), 25 deletions(-) (limited to 'src/mainboard/newisys/khepri') diff --git a/src/mainboard/newisys/khepri/Config.lb b/src/mainboard/newisys/khepri/Config.lb index db31552135..2050b01367 100644 --- a/src/mainboard/newisys/khepri/Config.lb +++ b/src/mainboard/newisys/khepri/Config.lb @@ -1,11 +1,8 @@ uses HAVE_MP_TABLE uses HAVE_PIRQ_TABLE uses USE_FALLBACK_IMAGE -uses USE_NORMAL_IMAGE -uses AMD8111_DEV uses MAINBOARD uses ARCH -uses ENABLE_IOMMU # # ### @@ -37,15 +34,11 @@ ldscript /cpu/i386/entry32.lds ### Build our reset vector (This is where linuxBIOS is entered) ### if USE_FALLBACK_IMAGE - mainboardinit cpu/i386/reset16.inc - ldscript /cpu/i386/reset16.lds + mainboardinit cpu/i386/reset16.inc + ldscript /cpu/i386/reset16.lds else - print "NO FALLBACK USED!" -end - -if USE_NORMAL_IMAGE - mainboardinit cpu/i386/reset32.inc - ldscript /cpu/i386/reset32.lds + mainboardinit cpu/i386/reset32.inc + ldscript /cpu/i386/reset32.lds end # #### Should this be in the northbridge code? @@ -78,7 +71,6 @@ mainboardinit cpu/k8/earlymtrr.inc # if USE_FALLBACK_IMAGE mainboardinit ./failover.inc -# mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc end # @@ -99,10 +91,6 @@ mainboardinit arch/i386/lib/console.inc ### ##option MAXIMUM_CONSOLE_LOGLEVEL=7 #default MAXIMUM_CONSOLE_LOGLEVEL=7 -#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8) -#if DISABLE_WATCHDOG -# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc -#end # #if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end # @@ -135,13 +123,6 @@ mainboardinit ./auto.inc mainboardinit cpu/k8/disable_mmx_sse.inc # ### -### Setup RAM -### -#mainboardinit ram/ramtest.inc -#mainboardinit southbridge/amd/amd8111/smbus.inc -#mainboardinit sdram/generic_dump_spd.inc -# -### ### Include the secondary Configuration files ### northbridge amd/amdk8 @@ -165,4 +146,3 @@ end cpu k8 "cpu1" end -option ENABLE_IOMMU=1 diff --git a/src/mainboard/newisys/khepri/auto.c b/src/mainboard/newisys/khepri/auto.c index ca19245293..29da7aa5e3 100644 --- a/src/mainboard/newisys/khepri/auto.c +++ b/src/mainboard/newisys/khepri/auto.c @@ -20,6 +20,8 @@ #include "northbridge/amd/amdk8/reset_test.c" #include "debug.c" +#define SIO_BASE 0x2e + static void memreset_setup(void) { /* Set the memreset low */ diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c index 9e5c0acc89..88c5977cbb 100644 --- a/src/mainboard/newisys/khepri/mainboard.c +++ b/src/mainboard/newisys/khepri/mainboard.c @@ -9,7 +9,7 @@ #include "chip.h" -unsigned long initial_apicid[MAX_CPUS] = +unsigned long initial_apicid[CONFIG_MAX_CPUS] = { 0, 1, }; -- cgit v1.2.3