diff options
author | Stefan Reinauer <stepan@openbios.org> | 2004-03-19 12:15:19 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2004-03-19 12:15:19 +0000 |
commit | 1943d501b4da5ad1de370208a4b64e177c55fe2a (patch) | |
tree | ef43b281680195ceae9370561c15c1f585499e7f /src/mainboard | |
parent | 0eed64bf66c91cb75bad04e6dc11c5a0e7c07670 (diff) | |
download | coreboot-1943d501b4da5ad1de370208a4b64e177c55fe2a.tar.xz |
adapt to 1.1.6
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1445 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard')
-rw-r--r-- | src/mainboard/newisys/khepri/Config.lb | 39 | ||||
-rw-r--r-- | src/mainboard/newisys/khepri/auto.c | 9 | ||||
-rw-r--r-- | src/mainboard/newisys/khepri/cmos.layout | 26 | ||||
-rw-r--r-- | src/mainboard/newisys/khepri/failover.c | 2 |
4 files changed, 58 insertions, 18 deletions
diff --git a/src/mainboard/newisys/khepri/Config.lb b/src/mainboard/newisys/khepri/Config.lb index f0ffeb4e76..d0bd8654d4 100644 --- a/src/mainboard/newisys/khepri/Config.lb +++ b/src/mainboard/newisys/khepri/Config.lb @@ -1,28 +1,34 @@ uses HAVE_MP_TABLE uses HAVE_PIRQ_TABLE uses USE_FALLBACK_IMAGE -uses USE_OPTION_TABLE uses HAVE_FALLBACK_BOOT uses HAVE_HARD_RESET +uses IRQ_SLOT_COUNT uses HAVE_OPTION_TABLE +uses CONFIG_MAX_CPUS +uses CONFIG_IOAPIC +uses CONFIG_SMP uses FALLBACK_SIZE uses ROM_SIZE uses ROM_SECTION_SIZE uses ROM_IMAGE_SIZE uses ROM_SECTION_SIZE uses ROM_SECTION_OFFSET -uses CONFIG_SMP -uses CONFIG_MAX_CPUS -uses CONFIG_IOAPIC uses CONFIG_ROM_STREAM uses CONFIG_ROM_STREAM_START uses PAYLOAD_SIZE uses _ROMBASE uses XIP_ROM_SIZE uses XIP_ROM_BASE -uses IRQ_SLOT_COUNT uses STACK_SIZE uses HEAP_SIZE +uses USE_OPTION_TABLE +uses LB_CKS_RANGE_START +uses LB_CKS_RANGE_END +uses LB_CKS_LOC +uses MAINBOARD_PART_NUMBER +uses MAINBOARD_VENDOR + ## ROM_SIZE is the size of boot ROM that this board will use. default ROM_SIZE=524288 @@ -45,7 +51,7 @@ default HAVE_HARD_RESET=1 ## Build code to export a programmable irq routing table ## default HAVE_PIRQ_TABLE=1 -default IRQ_SLOT_COUNT=7 +default IRQ_SLOT_COUNT=9 ## ## Build code to export an x86 MP table @@ -59,6 +65,13 @@ default HAVE_MP_TABLE=1 default HAVE_OPTION_TABLE=1 ## +## Move the default LinuxBIOS cmos range off of AMD RTC registers +## +default LB_CKS_RANGE_START=49 +default LB_CKS_RANGE_END=122 +default LB_CKS_LOC=123 + +## ## Build code for SMP support ## Only worry about 2 micro processors ## @@ -70,6 +83,12 @@ default CONFIG_MAX_CPUS=2 ## default CONFIG_IOAPIC=1 +## +## Clean up the motherboard id strings +## +default MAINBOARD_PART_NUMBER="Khepri 2100" +default MAINBOARD_VENDOR="Newisys" + ### ### LinuxBIOS layout values ### @@ -154,12 +173,12 @@ end makerule ./failover.inc depends "./failover.E ./romcc" - action "./romcc -O2 -o failover.inc --label-prefix=failover ./failover.E" + action "./romcc -O -o failover.inc --label-prefix=failover ./failover.E" end makerule ./auto.E - depends "$(MAINBOARD)/auto.c" - action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E" + depends "$(MAINBOARD)/auto.c option_table.h" + action "$(CPP) -I$(TOP)/src -I. $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E" end makerule ./auto.inc depends "./auto.E ./romcc" @@ -171,6 +190,7 @@ end ## mainboardinit cpu/i386/entry16.inc mainboardinit cpu/i386/entry32.inc +mainboardinit cpu/i386/bist32.inc ldscript /cpu/i386/entry16.lds ldscript /cpu/i386/entry32.lds @@ -300,4 +320,5 @@ end ## mainboardinit pc80/serial.inc mainboardinit arch/i386/lib/console.inc +mainboardinit cpu/i386/bist32_fail.inc diff --git a/src/mainboard/newisys/khepri/auto.c b/src/mainboard/newisys/khepri/auto.c index 44f128addc..8b7a85d6de 100644 --- a/src/mainboard/newisys/khepri/auto.c +++ b/src/mainboard/newisys/khepri/auto.c @@ -4,9 +4,8 @@ #include <stdint.h> #include <device/pci_def.h> -#include <cpu/p6/apic.h> #include <arch/io.h> -#include <device/pnp.h> +#include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/smp/lapic.h> #include "option_table.h" @@ -98,13 +97,13 @@ static unsigned int generate_row(uint8_t node, uint8_t row, uint8_t maxnodes) { 0x00010404, 0x00050101 } }; - if(maxnodes>2) { + if(maxnodes > 2) { print_debug("this mainboard is only designed for 2 cpus\r\n"); maxnodes=2; } - if (!(node>=maxnodes || row>=maxnodes)) { + if (!(node >= maxnodes || row >= maxnodes)) { ret=rows_2p[node][row]; } @@ -176,7 +175,6 @@ static void main(void) print_info("ht reset -"); soft_reset(); } - #if 0 print_pci_devices(); #endif @@ -194,7 +192,6 @@ static void main(void) dump_pci_device(PCI_DEV(0, 0x18, 2)); #endif - /* Check all of memory */ #if 0 /* Check the first 1M */ ram_check(0x00000000, 0x000100000); diff --git a/src/mainboard/newisys/khepri/cmos.layout b/src/mainboard/newisys/khepri/cmos.layout index 5ba4c032c1..247715e6ac 100644 --- a/src/mainboard/newisys/khepri/cmos.layout +++ b/src/mainboard/newisys/khepri/cmos.layout @@ -29,6 +29,9 @@ entries 386 1 e 1 ECC_memory 388 4 r 0 reboot_bits 392 3 e 5 baud_rate +395 1 e 1 hw_scrubber +396 1 e 1 interleave_chip_selects +397 2 e 8 max_mem_clock 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 416 4 e 7 boot_first @@ -36,7 +39,14 @@ entries 424 4 e 7 boot_third 428 4 h 0 boot_index 432 8 h 0 boot_countdown -1008 16 h 0 check_sum +440 4 e 9 slow_cpu +444 1 e 1 nmi +728 256 h 0 user_data +984 16 h 0 check_sum +# Reserve the extended AMD configuration registers +1000 24 r 0 reserved_memory + + enumerations @@ -66,9 +76,21 @@ enumerations 7 9 Fallback_HDD 7 10 Fallback_Floppy #7 3 ROM +8 0 200Mhz +8 1 166Mhz +8 2 133Mhz +8 3 100Mhz +9 0 off +9 1 87.5% +9 2 75.0% +9 3 62.5% +9 4 50.0% +9 5 37.5% +9 6 25.0% +9 7 12.5% checksums -checksum 392 1007 1008 +checksum 392 983 984 diff --git a/src/mainboard/newisys/khepri/failover.c b/src/mainboard/newisys/khepri/failover.c index bd9c17020e..e40891b50d 100644 --- a/src/mainboard/newisys/khepri/failover.c +++ b/src/mainboard/newisys/khepri/failover.c @@ -14,7 +14,7 @@ static void main(void) { /* Nothing special needs to be done to find bus 0 */ /* Allow the HT devices to be found */ - enumerate_ht_chain(0); + enumerate_ht_chain(); /* Setup the 8111 */ amd8111_enable_rom(); |