- Updates to config.g so that it works more reliably and has initial support

[coreboot.git] / documentation / RFC / config.tex

diff --git a/documentation/RFC/config.tex b/documentation/RFC/config.tex
index 652e7bc467aa979ea49a3d565d289d5118ed3c66..d73f96db836a1cf6855dc84ca72e519965af936d 100644 (file)
--- a/documentation/RFC/config.tex
+++ b/documentation/RFC/config.tex
@@ -205,13 +205,11 @@ ldscript cpu/i386/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 
-end
-
-if USE_NORMAL_IMAGE
-  mainboardinit cpu/i386/reset32.inc 
-  ldscript cpu/i386/reset32.lds 
+       mainboardinit cpu/i386/reset16.inc 
+       ldscript cpu/i386/reset16.lds 
+else
+       mainboardinit cpu/i386/reset32.inc 
+       ldscript cpu/i386/reset32.lds 
 end
 .
 .
@@ -229,13 +227,6 @@ makerule ./auto.inc dep "./romcc ./auto.E" act "./romcc -O ./auto.E > auto.inc"
 mainboardinit ./auto.inc
 #
 ###
-### Setup RAM
-###
-mainboardinit ram/ramtest.inc
-mainboardinit southbridge/amd/amd8111/smbus.inc
-mainboardinit sdram/generic_dump_spd.inc
-#
-###
 ### Include the secondary Configuration files 
 ###
 northbridge amd/amdk8
@@ -286,7 +277,7 @@ export ARCH:=i386
 export _RAMBASE:=0x4000
 export ROM_IMAGE_SIZE:=65535
 export PAYLOAD_SIZE:=131073
-export MAX_CPUS:=1
+export CONFIG_MAX_CPUS:=1
 export HEAP_SIZE:=8192
 export STACK_SIZE:=8192
 export MEMORY_HOLE:=0