Apply linuxbios-rename-other-payload-options.patch
[coreboot.git] / src / mainboard / tyan / s2735 / Config.lb
index eb1bb5c9346d713f629eaec396484ade4f598629..46f1b3821f646cf5dfad5e3d9fb6f80480408a32 100644 (file)
@@ -15,12 +15,13 @@ end
 ## The linuxBIOS bootloader.
 ##
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## Compute where this copy of linuxBIOS will start in the boot rom
 ##
-default _ROMBASE      = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE )
+default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
 
 ##
 ## Compute a range of ROM that can cached to speed up linuxBIOS,
@@ -34,6 +35,7 @@ default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
 
 arch i386 end 
 
+
 ##
 ## Build the objects we have code for in this directory.
 ##
@@ -41,28 +43,50 @@ arch i386 end
 driver mainboard.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
-#object reset.o
+object reset.o
+if USE_DCACHE_RAM
+
+if CONFIG_USE_INIT
+
+makerule ./auto.o
+        depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
+        action "$(CC) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o auto.o"
+end
+
+else
+
+makerule ./auto.inc
+        depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
+        action "$(CC) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/cache_as_ram_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -S -o $@"
+        action "perl -e 's/.rodata/.rom.data/g' -pi $@"
+        action "perl -e 's/.text/.section .rom.text/g' -pi $@"
+end
+
+end
+else
 
 ##
 ## 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 -O -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 option_table.h " 
-       action  "$(CPP) -I$(TOP)/src -I. $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E"
+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
-makerule ./auto.inc 
-       depends "./auto.E ./romcc"
-       action  "./romcc -mcpu=k8 -O2 ./auto.E > auto.inc"
+
 end
 
 ##
@@ -71,7 +95,16 @@ end
 mainboardinit cpu/x86/16bit/entry16.inc
 mainboardinit cpu/x86/32bit/entry32.inc
 ldscript /cpu/x86/16bit/entry16.lds
-ldscript /cpu/x86/32bit/entry32.lds
+if USE_DCACHE_RAM
+        if CONFIG_USE_INIT
+                ldscript /cpu/x86/32bit/entry32.lds
+        end
+
+        if CONFIG_USE_INIT
+                ldscript      /cpu/x86/car/cache_as_ram.lds
+        end
+end
+
 
 ##
 ## Build our reset vector (This is where linuxBIOS is entered)
@@ -84,8 +117,11 @@ else
        ldscript /cpu/x86/32bit/reset32.lds 
 end
 
+if USE_DCACHE_RAM
+else
 ### Should this be in the northbridge code?
 mainboardinit arch/i386/lib/cpu_reset.inc
+end
 
 ##
 ## Include an id string (For safe flashing)
@@ -93,23 +129,40 @@ mainboardinit arch/i386/lib/cpu_reset.inc
 mainboardinit arch/i386/lib/id.inc
 ldscript /arch/i386/lib/id.lds
 
+if USE_DCACHE_RAM
+##
+## Setup Cache-As-Ram
+##
+mainboardinit cpu/x86/car/cache_as_ram.inc
+end
+
 ###
 ### This is the early phase of linuxBIOS 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 USE_DCACHE_RAM
+       ldscript /arch/i386/lib/failover.lds
+else
+       ldscript /arch/i386/lib/failover.lds
+        mainboardinit ./failover.inc
+end
 end
-
-###
-### O.k. We aren't just an intermediary anymore!
-###
 
 ##
 ## Setup RAM
 ##
+if USE_DCACHE_RAM
+
+if CONFIG_USE_INIT
+initobject auto.o
+else
+mainboardinit ./auto.inc
+end
+
+else
+# ROMCC
 mainboardinit cpu/x86/fpu/enable_fpu.inc
 mainboardinit cpu/x86/mmx/enable_mmx.inc
 mainboardinit cpu/x86/sse/enable_sse.inc
@@ -117,77 +170,98 @@ mainboardinit ./auto.inc
 mainboardinit cpu/x86/sse/disable_sse.inc
 mainboardinit cpu/x86/mmx/disable_mmx.inc
 
+end
+
 ##
 ## Include the secondary Configuration files 
 ##
-dir /pc80
-config chip.h
+if CONFIG_CHIP_NAME
+       config chip.h
+end
+
 
 # sample config for tyan/s2735
 chip northbridge/intel/e7501
         device pci_domain 0 on
-                device pci 0.0 on end
-                device pci 0.1 on end
-                device pci 2.0 on
-                        chip southbridge/intel/i82870
-                                device pci 1c.0 on end
-                                device pci 1d.0 on end
-                                device pci 1e.0 on end
-                                device pci 1f.0 on end
-                        end
-                end
-                device pci 6.0 on end
-                chip southbridge/intel/i82801er
-                        device pci 1d.0 on end
-                        device pci 1d.1 on end
-                        device pci 1d.2 on end
-                        device pci 1d.3 on end
-                        device pci 1d.7 on end
-                        device pci 1e.0 on end
-                        device pci 1f.0 on
-                                # device pci 8.0 end
-                                chip superio/winbond/w83627hf
-                                        device pnp 2e.0 on     #  Floppy
-                                                 io 0x60 = 0x3f0
+               device pci 0.0 on end
+               device pci 0.1 on end
+               device pci 2.0 on
+                       chip southbridge/intel/i82870
+                               device pci 1c.0 on end
+                               device pci 1d.0 on 
+                                       chip drivers/pci/onboard
+                                               device pci 1.0 on end # intel lan
+                                                device pci 1.1 on end
+                                        end
+                               end
+                               device pci 1e.0 on end
+                               device pci 1f.0 on end
+                       end
+               end
+               device pci 6.0 on end
+               chip southbridge/intel/i82801er
+                       device pci 1d.0 on end
+                       device pci 1d.1 on end
+                       device pci 1d.2 on end
+                       device pci 1d.3 on end
+                       device pci 1d.7 on end
+                       device pci 1e.0 on 
+                               chip drivers/pci/onboard
+                                       device pci 1.0 on end # intel lan 10/100
+                                end
+                                chip drivers/pci/onboard
+                                        device pci 2.0 on end # ati 
+                                end
+                       end
+                       device pci 1f.0 on
+                               chip superio/winbond/w83627hf
+                                       device pnp 2e.0 on #  Floppy
+                                               io 0x60 = 0x3f0
                                                 irq 0x70 = 6
                                                 drq 0x74 = 2
                                         end
-                                        device pnp 2e.1 off     #  Parallel Port
-                                                 io 0x60 = 0x378
+                                       device pnp 2e.1 off #  Parallel Port
+                                                io 0x60 = 0x378
                                                 irq 0x70 = 7
                                         end
-                                        device pnp 2e.2 on      #  Com1
-                                                 io 0x60 = 0x3f8
+                                        device pnp 2e.2 on #  Com1
+                                               io 0x60 = 0x3f8
                                                 irq 0x70 = 4
                                         end
-                                        device pnp 2e.3 off     #  Com2
-                                                 io 0x60 = 0x2f8
+                                        device pnp 2e.3 on #  Com2
+                                                io 0x60 = 0x2f8
                                                 irq 0x70 = 3
                                         end
-                                        device pnp 2e.5 on      #  Keyboard
-                                                 io 0x60 = 0x60
-                                                 io 0x62 = 0x64
+                                        device pnp 2e.5 on #  Keyboard
+                                                io 0x60 = 0x60
+                                                io 0x62 = 0x64
                                                 irq 0x70 = 1
                                                 irq 0x72 = 12
                                         end
-                                        device pnp 2e.6 off end #  CIR
-                                        device pnp 2e.7 off end #  GAME_MIDI_GIPO1
+                                        device pnp 2e.6 off #  CIR
+                                                io 0x60 = 0x100
+                                        end
+                                        device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                                                io 0x60 = 0x220
+                                                io 0x62 = 0x300
+                                                irq 0x70 = 9
+                                        end                               
                                         device pnp 2e.8 off end #  GPIO2
                                         device pnp 2e.9 off end #  GPIO3
                                         device pnp 2e.a off end #  ACPI
-                                        device pnp 2e.b on      #  HW Monitor
-                                                 io 0x60 = 0x290
+                                        device pnp 2e.b on #  HW Monitor
+                                                io 0x60 = 0x290
+                                                irq 0x70 = 5
                                         end
-                                end
-                        end
-                        device pci 1f.1 off end
-                        device pci 1f.2 on end
-                        device pci 1f.3 on end
-                        device pci 1f.5 off end
-                        device pci 1f.6 off end
-
-                end
-        end
+                               end
+                       end
+                       device pci 1f.1 off end
+                       device pci 1f.2 on end
+                       device pci 1f.3 on end
+                       device pci 1f.5 off end
+                       device pci 1f.6 off end
+               end # SB
+        end # PCI_DOMAIN
         device apic_cluster 0 on
                 chip cpu/intel/socket_mPGA604_533Mhz
                         device apic 0 on end