GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kill remaining unneeded CAR/ROMCC if-blocks. 

Lots of Config.lb files still have "if USE_DCACHE_RAM" sections although
USE_DCACHE_RAM is always set for them. Such checks are not only
pointless, they actively make the files hard to read.

A full abuild run confirmed that compilation did not change with this
patch applied.

The patch does not change whitespace of the remaining code to ease
review and svn blame.

With this change, it should be possible to have two or three Config.lb
variants in total (except the actual hardware config). Right now, some
Config.lb have comments, some don't, some have empty lines for better
readability, some don't, some have leading whitespace, some don't. This
is an utter mess and unifying these files would certainly reduce the
headaches I have when looking at them.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4093 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Carl-Daniel Hailfinger 2009-04-11 14:51:49 +00:00
parent 4eb37059ce
commit ebdc7c7cfe
28 changed files with 0 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/amd/db800/Config.lb
View File

@ -50,7 +50,6 @@ if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
#compile cache_as_ram.c to auto.inc #compile cache_as_ram.c to auto.inc
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -58,8 +57,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.rodata/.rom.data/g' -pi $@" action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
@ -108,10 +105,8 @@ end
## ##
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

16
src/mainboard/amd/dbm690t/Config.lb
View File

@ -83,8 +83,6 @@ end
#object reset.o #object reset.o
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -103,14 +101,12 @@ if USE_DCACHE_RAM
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
## ##
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
ldscript /cpu/x86/16bit/entry16.lds ldscript /cpu/x86/16bit/entry16.lds
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -118,7 +114,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -137,12 +132,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -150,12 +143,7 @@ end
### failover to another image. ### failover to another image.
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
else
ldscript /arch/i386/lib/failover.lds
mainboardinit ./failover.inc
end
end end
### ###
@ -165,16 +153,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

5
src/mainboard/amd/norwich/Config.lb
View File

@ -52,7 +52,6 @@ end
#object reset.o #object reset.o
if USE_DCACHE_RAM
#compile cache_as_ram.c to auto.inc #compile cache_as_ram.c to auto.inc
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -60,8 +59,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.rodata/.rom.data/g' -pi $@" action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
@ -110,10 +107,8 @@ end
## ##
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

16
src/mainboard/amd/pistachio/Config.lb
View File

@ -83,8 +83,6 @@ end
#object reset.o #object reset.o
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -103,14 +101,12 @@ if USE_DCACHE_RAM
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
## ##
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
ldscript /cpu/x86/16bit/entry16.lds ldscript /cpu/x86/16bit/entry16.lds
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -118,7 +114,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -137,12 +132,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -150,12 +143,7 @@ end
### failover to another image. ### failover to another image.
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
else
ldscript /arch/i386/lib/failover.lds
mainboardinit ./failover.inc
end
end end
### ###
@ -165,16 +153,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

15
src/mainboard/amd/serengeti_cheetah/Config.lb
View File

@ -122,8 +122,6 @@ if HAVE_ACPI_TABLES
end end
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
# compile cache_as_ram.c to auto.o # compile cache_as_ram.c to auto.o
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -140,7 +138,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
@ -170,7 +167,6 @@ else
end end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -178,7 +174,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -207,12 +202,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -221,15 +214,11 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
@ -240,16 +229,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

14
src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
View File

@ -129,7 +129,6 @@ if HAVE_ACPI_TABLES
end end
end end
if USE_DCACHE_RAM
makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c
if CONFIG_USE_INIT if CONFIG_USE_INIT
@ -149,7 +148,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
@ -179,7 +177,6 @@ else
end end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -187,7 +184,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -217,12 +213,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -231,15 +225,11 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
@ -250,16 +240,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

6
src/mainboard/artecgroup/dbe61/Config.lb
View File

@ -47,8 +47,6 @@ driver mainboard.o
if HAVE_PIRQ_TABLE object irq_tables.o end if HAVE_PIRQ_TABLE object irq_tables.o end
#object reset.o #object reset.o
if USE_DCACHE_RAM
#compile cache_as_ram.c to auto.inc #compile cache_as_ram.c to auto.inc
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -56,8 +54,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.rodata/.rom.data/g' -pi $@" action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
@ -106,10 +102,8 @@ end
## ##
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

16
src/mainboard/asus/a8n_e/Config.lb
View File

@ -54,7 +54,6 @@ driver mainboard.o
object get_bus_conf.o object get_bus_conf.o
if HAVE_MP_TABLE object mptable.o end if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.o end if HAVE_PIRQ_TABLE object irq_tables.o end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
makerule ./auto.o makerule ./auto.o
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -68,7 +67,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end end
end
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
@ -81,12 +79,10 @@ else
end end
end end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
mainboardinit cpu/x86/16bit/reset16.inc mainboardinit cpu/x86/16bit/reset16.inc
@ -104,10 +100,6 @@ else
ldscript /cpu/x86/32bit/reset32.lds ldscript /cpu/x86/32bit/reset32.lds
end end
end end
if USE_DCACHE_RAM
else
mainboardinit arch/i386/lib/cpu_reset.inc
end
# Include an ID string (for safe flashing). # Include an ID string (for safe flashing).
mainboardinit southbridge/nvidia/ck804/id.inc mainboardinit southbridge/nvidia/ck804/id.inc
ldscript /southbridge/nvidia/ck804/id.lds ldscript /southbridge/nvidia/ck804/id.lds
@ -123,29 +115,21 @@ else
ldscript /southbridge/nvidia/ck804/romstrap.lds ldscript /southbridge/nvidia/ck804/romstrap.lds
end end
end end
if USE_DCACHE_RAM
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject auto.o initobject auto.o
else else
mainboardinit ./auto.inc mainboardinit ./auto.inc
end end
end
config chip.h config chip.h
chip northbridge/amd/amdk8/root_complex # Root complex chip northbridge/amd/amdk8/root_complex # Root complex

10
src/mainboard/asus/a8v-e_se/Config.lb
View File

@ -52,7 +52,6 @@ if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -66,7 +65,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end end
end
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
@ -77,14 +75,12 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/x86/16bit/reset16.inc mainboardinit cpu/x86/16bit/reset16.inc
@ -94,23 +90,17 @@ else
ldscript /cpu/x86/32bit/reset32.lds ldscript /cpu/x86/32bit/reset32.lds
end end
if USE_DCACHE_RAM
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
config chip.h config chip.h

10
src/mainboard/asus/m2v-mx_se/Config.lb
View File

@ -55,7 +55,6 @@ if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -69,7 +68,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end end
end
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
@ -80,14 +78,12 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/x86/16bit/reset16.inc mainboardinit cpu/x86/16bit/reset16.inc
@ -97,23 +93,17 @@ else
ldscript /cpu/x86/32bit/reset32.lds ldscript /cpu/x86/32bit/reset32.lds
end end
if USE_DCACHE_RAM
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
config chip.h config chip.h

16
src/mainboard/broadcom/blast/Config.lb
View File

@ -50,8 +50,6 @@ end
#object reset.o #object reset.o
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -70,14 +68,12 @@ if USE_DCACHE_RAM
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
## ##
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
ldscript /cpu/x86/16bit/entry16.lds ldscript /cpu/x86/16bit/entry16.lds
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -85,7 +81,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -104,12 +99,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -117,12 +110,7 @@ end
### failover to another image. ### failover to another image.
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
else
ldscript /arch/i386/lib/failover.lds
mainboardinit ./failover.inc
end
end end
### ###
@ -132,16 +120,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

6
src/mainboard/digitallogic/msm800sev/Config.lb
View File

@ -48,7 +48,6 @@ if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
#compile cache_as_ram.c to auto.inc #compile cache_as_ram.c to auto.inc
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -56,9 +55,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.rodata/.rom.data/g' -pi $@" action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
@ -107,10 +103,8 @@ end
## ##
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

15
src/mainboard/gigabyte/ga_2761gxdk/Config.lb
View File

@ -82,7 +82,6 @@ object get_bus_conf.o
if HAVE_MP_TABLE object mptable.o end if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -98,8 +97,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
@ -129,7 +126,6 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -137,8 +133,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -182,12 +176,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -196,29 +188,22 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

15
src/mainboard/gigabyte/m57sli/Config.lb
View File

@ -80,7 +80,6 @@ object get_bus_conf.o
if HAVE_MP_TABLE object mptable.o end if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -96,8 +95,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
@ -127,7 +124,6 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -135,8 +131,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -180,12 +174,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -194,15 +186,11 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
@ -213,14 +201,11 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

4
src/mainboard/iei/pcisa-lx-800-r10/Config.lb
View File

@ -35,7 +35,6 @@ driver mainboard.o
if HAVE_PIRQ_TABLE if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
# Compile cache_as_ram.c to auto.inc. # Compile cache_as_ram.c to auto.inc.
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
# depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" # depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -44,7 +43,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.rodata/.rom.data/g' -pi $@" action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
ldscript /cpu/x86/16bit/entry16.lds ldscript /cpu/x86/16bit/entry16.lds
@ -63,10 +61,8 @@ if USE_FALLBACK_IMAGE
# mainboardinit ./failover.inc # mainboardinit ./failover.inc
end end
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
dir /pc80 dir /pc80
config chip.h config chip.h

15
src/mainboard/iwill/dk8_htx/Config.lb
View File

@ -129,8 +129,6 @@ if HAVE_ACPI_TABLES
end end
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
# compile cache_as_ram.c to auto.o # compile cache_as_ram.c to auto.o
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -148,7 +146,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
@ -178,7 +175,6 @@ else
end end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -186,7 +182,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -215,12 +210,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -229,15 +222,11 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
@ -248,16 +237,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

5
src/mainboard/lippert/roadrunner-lx/Config.lb
View File

@ -72,7 +72,6 @@ if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
# compile cache_as_ram.c to auto.inc # compile cache_as_ram.c to auto.inc
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/cache_as_ram_auto.c" depends "$(MAINBOARD)/cache_as_ram_auto.c"
@ -80,8 +79,6 @@ if USE_DCACHE_RAM
action "perl -e 's/.rodata/.rom.data/g' -pi $@" action "perl -e 's/.rodata/.rom.data/g' -pi $@"
action "perl -e 's/.text/.section .rom.text/g' -pi $@" action "perl -e 's/.text/.section .rom.text/g' -pi $@"
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
@ -130,10 +127,8 @@ end
## ##
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
## ##
## Include the secondary configuration files ## Include the secondary configuration files

4
src/mainboard/lippert/spacerunner-lx/Config.lb
View File

@ -70,7 +70,6 @@ if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
# compile cache_as_ram.c to auto.inc # compile cache_as_ram.c to auto.inc
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/cache_as_ram_auto.c" depends "$(MAINBOARD)/cache_as_ram_auto.c"
@ -78,7 +77,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.rodata/.rom.data/g' -pi $@" action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
@ -127,10 +125,8 @@ end
## ##
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
## ##
## Include the secondary configuration files ## Include the secondary configuration files

19
src/mainboard/msi/ms7135/Config.lb
View File

@ -90,7 +90,6 @@ if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
makerule ./auto.o makerule ./auto.o
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -104,7 +103,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code. ## Build our 16 bit and 32 bit coreboot entry code.
@ -123,12 +121,10 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (this is where coreboot is entered). ## Build our reset vector (this is where coreboot is entered).
@ -151,12 +147,6 @@ else
end end
end 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). ## Include an ID string (for safe flashing).
## ##
@ -178,13 +168,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup. ### This is the early phase of coreboot startup.
@ -193,15 +180,11 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
@ -212,13 +195,11 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject auto.o initobject auto.o
else else
mainboardinit ./auto.inc mainboardinit ./auto.inc
end end
end
## ##
## Include the secondary configuration files ## Include the secondary configuration files

12
src/mainboard/msi/ms7260/Config.lb
View File

@ -54,7 +54,6 @@ if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -68,7 +67,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
@ -95,14 +93,12 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
@ -138,31 +134,23 @@ else
end end
end end
if USE_DCACHE_RAM
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
config chip.h config chip.h

13
src/mainboard/msi/ms9185/Config.lb
View File

@ -77,8 +77,6 @@ if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
# compile cache_as_ram.c to auto.o # compile cache_as_ram.c to auto.o
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -96,7 +94,6 @@ if USE_DCACHE_RAM
end end
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
## ##
@ -107,7 +104,6 @@ if USE_FALLBACK_IMAGE
end end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -115,7 +111,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -134,12 +129,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -147,9 +140,7 @@ end
### failover to another image. ### failover to another image.
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
### ###
@ -159,16 +150,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

16
src/mainboard/nvidia/l1_2pvv/Config.lb
View File

@ -111,8 +111,6 @@ if HAVE_ACPI_TABLES
end end
end end
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -127,8 +125,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
@ -158,7 +154,6 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -166,8 +161,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -211,12 +204,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -225,29 +216,22 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

6
src/mainboard/pcengines/alix1c/Config.lb
View File

@ -68,7 +68,6 @@ if HAVE_PIRQ_TABLE
object irq_tables.o object irq_tables.o
end end
if USE_DCACHE_RAM
#compile cache_as_ram.c to auto.inc #compile cache_as_ram.c to auto.inc
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -76,9 +75,6 @@ if USE_DCACHE_RAM
action "perl -e 's/\.rodata/.rom.data/g' -pi $@" action "perl -e 's/\.rodata/.rom.data/g' -pi $@"
action "perl -e 's/\.text/.section .rom.text/g' -pi $@" action "perl -e 's/\.text/.section .rom.text/g' -pi $@"
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
@ -127,10 +123,8 @@ end
## ##
mainboardinit cpu/x86/fpu/enable_fpu.inc mainboardinit cpu/x86/fpu/enable_fpu.inc
if USE_DCACHE_RAM
mainboardinit cpu/amd/model_lx/cache_as_ram.inc mainboardinit cpu/amd/model_lx/cache_as_ram.inc
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

15
src/mainboard/supermicro/h8dme/Config.lb
View File

@ -77,7 +77,6 @@ object get_bus_conf.o
if HAVE_MP_TABLE object mptable.o end if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./auto.o makerule ./auto.o
@ -93,8 +92,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
@ -124,7 +121,6 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -132,8 +128,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -177,12 +171,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -191,29 +183,22 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject auto.o initobject auto.o
else else
mainboardinit ./auto.inc mainboardinit ./auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

15
src/mainboard/supermicro/h8dmr/Config.lb
View File

@ -80,7 +80,6 @@ object get_bus_conf.o
if HAVE_MP_TABLE object mptable.o end if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./auto.o makerule ./auto.o
@ -96,8 +95,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
@ -127,7 +124,6 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -135,8 +131,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -180,12 +174,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -194,29 +186,22 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject auto.o initobject auto.o
else else
mainboardinit ./auto.inc mainboardinit ./auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

16
src/mainboard/technexion/tim8690/Config.lb
View File

@ -83,8 +83,6 @@ end
#object reset.o #object reset.o
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
@ -103,14 +101,12 @@ if USE_DCACHE_RAM
end end
end
## ##
## Build our 16 bit and 32 bit coreboot entry code ## Build our 16 bit and 32 bit coreboot entry code
## ##
mainboardinit cpu/x86/16bit/entry16.inc mainboardinit cpu/x86/16bit/entry16.inc
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
ldscript /cpu/x86/16bit/entry16.lds ldscript /cpu/x86/16bit/entry16.lds
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -118,7 +114,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -137,12 +132,10 @@ end
mainboardinit arch/i386/lib/id.inc mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds ldscript /arch/i386/lib/id.lds
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -150,12 +143,7 @@ end
### failover to another image. ### failover to another image.
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
else
ldscript /arch/i386/lib/failover.lds
mainboardinit ./failover.inc
end
end end
### ###
@ -165,16 +153,12 @@ end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files
## ##

16
src/mainboard/tyan/s2912/Config.lb
View File

@ -81,8 +81,6 @@ if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.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 if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o makerule ./cache_as_ram_auto.o
depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h" depends "$(MAINBOARD)/cache_as_ram_auto.c option_table.h"
@ -97,8 +95,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
@ -128,7 +124,6 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -136,8 +131,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -181,12 +174,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -195,29 +186,22 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files

15
src/mainboard/tyan/s2912_fam10/Config.lb
View File

@ -81,7 +81,6 @@ if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.o end if HAVE_PIRQ_TABLE object irq_tables.o end
#object reset.o #object reset.o
if USE_DCACHE_RAM
makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c makedefine CACHE_AS_RAM_AUTO_C:=cache_as_ram_auto.c
if CONFIG_USE_INIT if CONFIG_USE_INIT
@ -98,8 +97,6 @@ if USE_DCACHE_RAM
end end
end end
end
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
else else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
@ -129,7 +126,6 @@ end
mainboardinit cpu/x86/32bit/entry32.inc mainboardinit cpu/x86/32bit/entry32.inc
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/x86/32bit/entry32.lds ldscript /cpu/x86/32bit/entry32.lds
end end
@ -137,8 +133,6 @@ if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
ldscript /cpu/amd/car/cache_as_ram.lds ldscript /cpu/amd/car/cache_as_ram.lds
end end
end
## ##
## Build our reset vector (This is where coreboot is entered) ## Build our reset vector (This is where coreboot is entered)
@ -182,12 +176,10 @@ else
end end
end end
if USE_DCACHE_RAM
## ##
## Setup Cache-As-Ram ## Setup Cache-As-Ram
## ##
mainboardinit cpu/amd/car/cache_as_ram.inc mainboardinit cpu/amd/car/cache_as_ram.inc
end
### ###
### This is the early phase of coreboot startup ### This is the early phase of coreboot startup
@ -196,29 +188,22 @@ end
### ###
if HAVE_FAILOVER_BOOT if HAVE_FAILOVER_BOOT
if USE_FAILOVER_IMAGE if USE_FAILOVER_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover_failover.lds ldscript /arch/i386/lib/failover_failover.lds
end
end end
else else
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
if USE_DCACHE_RAM
ldscript /arch/i386/lib/failover.lds ldscript /arch/i386/lib/failover.lds
end
end end
end end
## ##
## Setup RAM ## Setup RAM
## ##
if USE_DCACHE_RAM
if CONFIG_USE_INIT if CONFIG_USE_INIT
initobject cache_as_ram_auto.o initobject cache_as_ram_auto.o
else else
mainboardinit ./cache_as_ram_auto.inc mainboardinit ./cache_as_ram_auto.inc
end end
end
## ##
## Include the secondary Configuration files ## Include the secondary Configuration files