This patch unifies the use of config options in v2 to all start with CONFIG_
[coreboot.git] / src / mainboard / tyan / s4880 / Config.lb
index b9387cb70087ff45db417d76413e194aaf12163a..c85db4b9b2bd4f42416f48525d6cb569456e5dda 100644 (file)
@@ -1,82 +1,58 @@
-##
-## Compute the location and size of where this firmware image
-## (linuxBIOS plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-       default ROM_SECTION_SIZE   = FALLBACK_SIZE
-       default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-       default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-       default ROM_SECTION_OFFSET = 0
-end
-
-##
-## Compute the start location and size size of
-## The linuxBIOS bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of linuxBIOS will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up linuxBIOS,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=65536
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
+## CONFIG_XIP_ROM_SIZE must be a power of 2.
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
+include /config/nofailovercalculation.lb
+default CONFIG_ROM_PAYLOAD = 1
 
 arch i386 end 
 
+
 ##
 ## Build the objects we have code for in this directory.
 ##
 
 driver mainboard.o
-if HAVE_MP_TABLE object mptable.o end
-if HAVE_PIRQ_TABLE object irq_tables.o end
-#object reset.o
+if CONFIG_HAVE_MP_TABLE object mptable.o end
+if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
 
-##
-## Romcc output
-##
-makerule ./failover.E
-        depends "$(MAINBOARD)/failover.c ./romcc"
-        action "./romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
-end
+       if CONFIG_USE_INIT
 
-makerule ./failover.inc
-        depends "$(MAINBOARD)/failover.c ./romcc"
-        action "./romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
-end
+               makerule ./auto.o
+                       depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h"
+                       action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(TOP)/src -I. -c $(CONFIG_MAINBOARD)/cache_as_ram_auto.c -o $@"
+               end
 
-makerule ./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 "$(MAINBOARD)/auto.c option_table.h ./romcc"
-        action  "./romcc    -mcpu=k8 -O2 -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
-end
+       else
+
+               makerule ./auto.inc
+                       depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h"
+                       action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(TOP)/src -I. -c -S $(CONFIG_MAINBOARD)/cache_as_ram_auto.c -o $@"
+                       action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
+                       action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
+                       end
+       end
 
 ##
-## Build our 16 bit and 32 bit linuxBIOS entry code
+## Build our 16 bit and 32 bit coreboot entry code
 ##
-mainboardinit cpu/x86/16bit/entry16.inc
+if CONFIG_USE_FALLBACK_IMAGE
+        mainboardinit cpu/x86/16bit/entry16.inc
+        ldscript /cpu/x86/16bit/entry16.lds
+end
+
 mainboardinit cpu/x86/32bit/entry32.inc
-ldscript /cpu/x86/16bit/entry16.lds
-ldscript /cpu/x86/32bit/entry32.lds
+
+        if CONFIG_USE_INIT
+                ldscript /cpu/x86/32bit/entry32.lds
+        end
+
+        if CONFIG_USE_INIT
+                ldscript /cpu/amd/car/cache_as_ram.lds
+        end
 
 ##
-## Build our reset vector (This is where linuxBIOS is entered)
+## Build our reset vector (This is where coreboot is entered)
 ##
-if USE_FALLBACK_IMAGE 
+if CONFIG_USE_FALLBACK_IMAGE 
        mainboardinit cpu/x86/16bit/reset16.inc 
        ldscript /cpu/x86/16bit/reset16.lds 
 else
@@ -84,49 +60,48 @@ else
        ldscript /cpu/x86/32bit/reset32.lds 
 end
 
-### Should this be in the northbridge code?
-mainboardinit arch/i386/lib/cpu_reset.inc
-
 ##
 ## Include an id string (For safe flashing)
 ##
 mainboardinit arch/i386/lib/id.inc
 ldscript /arch/i386/lib/id.lds
 
+       ##
+       ## Setup Cache-As-Ram
+       ##
+       mainboardinit cpu/amd/car/cache_as_ram.inc
+
 ###
-### This is the early phase of linuxBIOS startup 
+### This is the early phase of coreboot startup 
 ### Things are delicate and we test to see if we should
 ### failover to another image.
 ###
-if USE_FALLBACK_IMAGE
-       ldscript /arch/i386/lib/failover.lds 
-       mainboardinit ./failover.inc
+if CONFIG_USE_FALLBACK_IMAGE
+               ldscript /arch/i386/lib/failover.lds
 end
 
-###
-### O.k. We aren't just an intermediary anymore!
-###
-
 ##
 ## Setup RAM
 ##
-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/x86/sse/disable_sse.inc
-mainboardinit cpu/x86/mmx/disable_mmx.inc
+       if CONFIG_USE_INIT
+               initobject auto.o
+       else
+               mainboardinit ./auto.inc
+       end
 
 ##
 ## Include the secondary Configuration files 
 ##
-dir /pc80
-if CONFIG_CHIP_NAME
-        config chip.h
-end
+config chip.h
 
 # sample config for tyan/s4880
 chip northbridge/amd/amdk8/root_complex
+        device apic_cluster 0 on
+                chip cpu/amd/socket_940
+                        device apic 0 on end
+                end
+        end
+
        device pci_domain 0 on
                chip northbridge/amd/amdk8
                        device pci 18.0 on end # LDT0
@@ -135,7 +110,17 @@ chip northbridge/amd/amdk8/root_complex
                                #  devices on link 2, link 2 == LDT 2
                                chip southbridge/amd/amd8131
                                        # the on/off keyword is mandatory
-                                       device pci 0.0 on end
+                                        device pci 0.0 on
+#                                                chip drivers/lsi/53c1030
+#                                                        device pci 4.0 on end
+#                                                        device pci 4.1 on end
+#                                                        register "fw_address" = "0xfff8c000"
+#                                                end
+                                                chip drivers/pci/onboard
+                                                        device pci 9.0 on end
+                                                        device pci 9.1 on end
+                                                end
+                                       end
                                        device pci 0.1 on end
                                        device pci 1.0 on end
                                        device pci 1.1 on end
@@ -148,6 +133,10 @@ chip northbridge/amd/amdk8/root_complex
                                                device pci 0.1 on end
                                                device pci 0.2 off end
                                                device pci 1.0 off end
+                                                chip drivers/pci/onboard
+                                                        device pci 6.0 on end
+                                                        register "rom_address" = "0xfff80000"
+                                                end
                                        end
                                        device pci 1.0 on
                                                chip superio/winbond/w83627hf
@@ -178,8 +167,8 @@ chip northbridge/amd/amdk8/root_complex
                                                                io 0x60 = 0x100
                                                        end
                                                        device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                               io 0x60 = 0x201
-                                                               io 0x62 = 0x330
+                                                               io 0x60 = 0x220
+                                                               io 0x62 = 0x300
                                                                irq 0x70 = 9
                                                        end  
                                                        device pnp 2e.8 off end #  GPIO2
@@ -196,6 +185,8 @@ chip northbridge/amd/amdk8/root_complex
                                        device pci 1.3 on end
                                        device pci 1.5 off end
                                        device pci 1.6 off end
+                                        register "ide0_enable" = "1"
+                                        register "ide1_enable" = "1"
                                end
                        end #  device pci 18.0 
                        
@@ -204,46 +195,6 @@ chip northbridge/amd/amdk8/root_complex
                        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
-
-                chip northbridge/amd/amdk8
-                        device pci 1a.0 on end
-                        device pci 1a.0 on end
-                        device pci 1a.0 on end
-                        device pci 1a.1 on end
-                        device pci 1a.2 on end
-                        device pci 1a.3 on end
-                end
-
-                chip northbridge/amd/amdk8
-                        device pci 1b.0 on end
-                        device pci 1b.0 on end
-                        device pci 1b.0 on end
-                        device pci 1b.1 on end
-                        device pci 1b.2 on end
-                        device pci 1b.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
-                chip cpu/amd/socket_940
-                        device apic 2 on end
-                end
-                chip cpu/amd/socket_940
-                        device apic 3 on end
-                end
-       end
+       end #pci_domain
 end