Change all occurences of NSC to nsc in the code. The next commit
[coreboot.git] / src / mainboard / newisys / khepri / Config.lb
index f0ffeb4e768eeada6de2eed51be3e47cd3cf08f1..e4ed8538fe6fdca8ff5adb28239d96ae27b4a611 100644 (file)
@@ -1,97 +1,3 @@
-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 HAVE_OPTION_TABLE
-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
-
-## ROM_SIZE is the size of boot ROM that this board will use.
-default ROM_SIZE=524288
-
-###
-### Build options
-###
-
-##
-## Build code for the fallback boot
-##
-default HAVE_FALLBACK_BOOT=1
-
-##
-## Build code to reset the motherboard from linuxBIOS
-##
-default HAVE_HARD_RESET=1
-
-##
-## Build code to export a programmable irq routing table
-##
-default HAVE_PIRQ_TABLE=1
-default IRQ_SLOT_COUNT=7
-
-##
-## Build code to export an x86 MP table
-## Useful for specifying IRQ routing values
-##
-default HAVE_MP_TABLE=1
-
-##
-## Build code to export a CMOS option table
-##
-default HAVE_OPTION_TABLE=1
-
-##
-## Build code for SMP support
-## Only worry about 2 micro processors
-##
-default CONFIG_SMP=1
-default CONFIG_MAX_CPUS=2
-
-##
-## Build code to setup a generic IOAPIC
-##
-default CONFIG_IOAPIC=1
-
-###
-### LinuxBIOS layout values
-###
-
-## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
-default ROM_IMAGE_SIZE = 65536
-
-##
-## Use a small 8K stack
-##
-default STACK_SIZE=0x2000
-
-##
-## Use a small 16K heap
-##
-default HEAP_SIZE=0x4000
-
-##
-## Only use the option table in a normal image
-##
-default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-
 ##
 ## Compute the location and size of where this firmware image
 ## (linuxBIOS plus bootloader) will live in the boot rom chip.
@@ -110,7 +16,6 @@ end
 ##
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-default CONFIG_ROM_STREAM     = 1
 
 ##
 ## Compute where this copy of linuxBIOS will start in the boot rom
@@ -132,57 +37,57 @@ default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
 ##
 
 arch i386 end
-#cpu k8 end
 
 ##
 ## Build the objects we have code for in this directory.
 ##
 
 driver mainboard.o
-driver blade3d.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
-object reset.o
+#object reset.o
+
+dir /drivers/trident/blade3d
 
 ##
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c" 
-       action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failover.E"
+       depends "$(MAINBOARD)/failover.c ./romcc
+       action "./romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "./failover.E ./romcc"
-       action "./romcc -O2 -o failover.inc --label-prefix=failover ./failover.E"
+       depends "$(MAINBOARD)/failover.c ./romcc"
+       action "./romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
 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 ./romcc
+       action  "./romcc -E -mcpu=k8 -O2 -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
 end
 makerule ./auto.inc 
-       depends "./auto.E ./romcc"
-       action  "./romcc -mcpu=k8 -O2 ./auto.E > auto.inc"
+       depends "$(MAINBOARD)/auto.c option_table.h ./romcc"
+       action  "./romcc    -mcpu=k8 -O2 -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
 end
 
 ##
 ## Build our 16 bit and 32 bit linuxBIOS entry code
 ##
-mainboardinit cpu/i386/entry16.inc
-mainboardinit cpu/i386/entry32.inc
-ldscript /cpu/i386/entry16.lds
-ldscript /cpu/i386/entry32.lds
+mainboardinit cpu/x86/16bit/entry16.inc
+mainboardinit cpu/x86/32bit/entry32.inc
+ldscript /cpu/x86/16bit/entry16.lds
+ldscript /cpu/x86/32bit/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/x86/16bit/reset16.inc 
+       ldscript /cpu/x86/16bit/reset16.lds 
 else
-       mainboardinit cpu/i386/reset32.inc 
-       ldscript /cpu/i386/reset32.lds 
+       mainboardinit cpu/x86/32bit/reset32.inc 
+       ldscript /cpu/x86/32bit/reset32.lds 
 end
 
 ### Should this be in the northbridge code?
@@ -194,11 +99,6 @@ mainboardinit arch/i386/lib/cpu_reset.inc
 mainboardinit arch/i386/lib/id.inc
 ldscript /arch/i386/lib/id.lds
 
-##
-## Setup our mtrrs
-##
-mainboardinit cpu/k8/earlymtrr.inc
-
 ###
 ### This is the early phase of linuxBIOS startup 
 ### Things are delicate and we test to see if we should
@@ -216,9 +116,12 @@ end
 ##
 ## Setup RAM
 ##
-mainboardinit cpu/k8/enable_mmx_sse.inc
+mainboardinit cpu/x86/fpu/enable_fpu.inc
+mainboardinit cpu/x86/mmx/enable_mmx.inc
+mainboardinit cpu/x86/sse/enable_sse.inc
 mainboardinit ./auto.inc
-mainboardinit cpu/k8/disable_mmx_sse.inc
+mainboardinit cpu/x86/sse/disable_sse.inc
+mainboardinit cpu/x86/mmx/disable_mmx.inc
 
 ##
 ## Include the secondary Configuration files 
@@ -226,78 +129,85 @@ mainboardinit cpu/k8/disable_mmx_sse.inc
 dir /pc80
 config chip.h
 
-northbridge amd/amdk8 "mc0"
-       pci 0:18.0
-       pci 0:18.0
-       pci 0:18.0
-       pci 0:18.1
-       pci 0:18.2
-       pci 0:18.3
-       southbridge amd/amd8131 "amd8131" link 1
-               pci 0:0.0
-               pci 0:0.1
-               pci 0:1.0
-               pci 0:1.1
-       end
-       southbridge amd/amd8111 "amd8111" link 1
-               pci 0:0.0
-               pci 0:1.0 on
-               pci 0:1.1 on
-               pci 0:1.2 on
-               pci 0:1.3 on
-               pci 0:1.5 on
-               pci 0:1.6 on
-               pci 1:0.0 on
-               pci 1:0.1 on
-               pci 1:0.2 on
-               pci 1:1.0 on
-               superio NSC/pc87360 link 1
-                       pnp 2e.0 off  # Floppy 
-                                io 0x60 = 0x3f0
-                               irq 0x70 = 6
-                               drq 0x74 = 2
-                       pnp 2e.1 off  # Parallel Port
-                                io 0x60 = 0x378
-                               irq 0x70 = 7
-                       pnp 2e.2 off # Com 2
-                                io 0x60 = 0x2f8
-                               irq 0x70 = 3
-                       pnp 2e.3 on  # Com 1
-                                io 0x60 = 0x3f8
-                               irq 0x70 = 4
-                       pnp 2e.4 off # SWC
-                       pnp 2e.5 off # Mouse
-                       pnp 2e.6 on  # Keyboard
-                                io 0x60 = 0x60
-                                io 0x62 = 0x64
-                               irq 0x70 = 1
-                       pnp 2e.7 off # GPIO
-                       pnp 2e.8 off # ACB
-                       pnp 2e.9 off # FSCM
-                       pnp 2e.a off # WDT  
+chip northbridge/amd/amdk8/root_complex
+       device pci_domain 0 on
+               chip northbridge/amd/amdk8
+                       device pci 18.0 on end # LDT 0 
+                       device pci 18.0 on     # LDT 1
+                               chip southbridge/amd/amd8131
+                                       device pci 0.0 on end
+                                       device pci 0.1 on end
+                                       device pci 1.0 on end
+                                       device pci 1.1 on end
+                               end
+                               chip southbridge/amd/amd8111
+                                       device pci 0.0 on
+                                               device pci 0.0 on end
+                                               device pci 0.1 on end
+                                               device pci 0.2 on end
+                                               device pci 1.0 on end
+                                       end
+                                       device pci 1.0 on
+                                               chip superio/nsc/pc87360
+                                                       device pnp 2e.0 off    # Floppy 
+                                                                io 0x60 = 0x3f0
+                                                               irq 0x70 = 6
+                                                               drq 0x74 = 2
+                                                       end
+                                                       device pnp 2e.1 off     # Parallel Port
+                                                                io 0x60 = 0x378
+                                                               irq 0x70 = 7
+                                                       end
+                                                       device pnp 2e.2 off     # Com 2
+                                                                io 0x60 = 0x2f8
+                                                               irq 0x70 = 3
+                                                       end
+                                                       device pnp 2e.3 on      # Com 1
+                                                                io 0x60 = 0x3f8
+                                                               irq 0x70 = 4
+                                                       end
+                                                       device pnp 2e.4 off end # SWC
+                                                       device pnp 2e.5 off end # Mouse
+                                                       device pnp 2e.6 on      # Keyboard
+                                                                io 0x60 = 0x60
+                                                                io 0x62 = 0x64
+                                                               irq 0x70 = 1
+                                                       end
+                                                       device pnp 2e.7 off end # GPIO
+                                                       device pnp 2e.8 off end # ACB
+                                                       device pnp 2e.9 off end # FSCM
+                                                       device pnp 2e.a off end # WDT  
+                       
+                                               end
+                                       end
+                                       device pci 1.1 on end
+                                       device pci 1.2 on end
+                                       device pci 1.3 on end 
+                                       device pci 1.5 on end
+                                       device pci 1.6 on end
+                               end
+                       end # LDT1
+                       device pci 18.0 on end # LDT2
+                       device pci 18.1 on end
+                       device pci 18.2 on end
+                       device pci 18.3 on end
+               end
+               chip northbridge/amd/amdk8
+                       device pci 19.0 on end
+                       device pci 19.0 on end
+                       device pci 19.0 on end
+                       device pci 19.1 on end
+                       device pci 19.2 on end
+                       device pci 19.3 on end
+               end
+       end 
+       device apic_cluster 0 on
+               chip cpu/amd/socket_940
+                       device apic 0 on end
+               end
+               chip cpu/amd/socket_940
+                       device apic 1 on end
                end
        end
 end
 
-northbridge amd/amdk8 "mc1"
-       pci 0:19.0
-       pci 0:19.0
-       pci 0:19.0
-       pci 0:19.1
-       pci 0:19.2
-       pci 0:19.3
-end
-
-cpu k8 "cpu0"
-       register "across" = "{ .chip = &amd8131, .ht_width=16, .ht_speed=600 }"
-end
-
-cpu k8 "cpu1" 
-end
-
-##
-## Include the old serial code for those few places that still need it.
-##
-mainboardinit pc80/serial.inc
-mainboardinit arch/i386/lib/console.inc
-