[coreboot] r703 - in coreboot-v3/arch/x86: . amd amdk8

[svn at coreboot.org]

Author: rminnich
Date: 2008-08-01 19:16:45 +0200 (Fri, 01 Aug 2008)
New Revision: 703

Modified:
   coreboot-v3/arch/x86/Kconfig
   coreboot-v3/arch/x86/amd/stage0.S
   coreboot-v3/arch/x86/amdk8/stage1.c
Log:
v3: Clean up a Kconfig value and fixup K8 CAR defines to get CONFIG_ values

Signed-off-by: Peter Stuge <peter at stuge.se>
Acked-by: Ronald G. Minnich <rminnich at gmail.com>



Modified: coreboot-v3/arch/x86/Kconfig
===================================================================
--- coreboot-v3/arch/x86/Kconfig	2008-08-01 17:03:22 UTC (rev 702)
+++ coreboot-v3/arch/x86/Kconfig	2008-08-01 17:16:45 UTC (rev 703)
@@ -90,6 +90,6 @@
 	hex
 	default 0x1000 if CPU_I586
 	default 0x8000 if CPU_AMD_GEODELX
-	default 0x08000 if CPU_AMD_K8
+	default 0x8000 if CPU_AMD_K8
 	help
 	  This option sets the size of the area used for CAR.

Modified: coreboot-v3/arch/x86/amd/stage0.S
===================================================================
--- coreboot-v3/arch/x86/amd/stage0.S	2008-08-01 17:03:22 UTC (rev 702)
+++ coreboot-v3/arch/x86/amd/stage0.S	2008-08-01 17:16:45 UTC (rev 703)
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 #include "../macros.h"
-#define CacheSize DCACHE_RAM_SIZE
-#define CacheBase DCACHE_RAM_BASE
+#define CacheSize CONFIG_CARSIZE
+#define CacheBase CONFIG_CARBASE
 #define MEM_TOPK 2048
 #define ASSEMBLY
 

Modified: coreboot-v3/arch/x86/amdk8/stage1.c
===================================================================
--- coreboot-v3/arch/x86/amdk8/stage1.c	2008-08-01 17:03:22 UTC (rev 702)
+++ coreboot-v3/arch/x86/amdk8/stage1.c	2008-08-01 17:16:45 UTC (rev 703)
@@ -35,7 +35,7 @@
 	 * the data back over itself, and the wbinvd should then 
 	 * flush to memory. Let's see. 
 	 */
-	__asm__ __volatile__("cld; rep movsl" ::"D" (DCACHE_RAM_BASE), "S" (DCACHE_RAM_BASE), "c" (DCACHE_RAM_SIZE/4): "memory");
+	__asm__ __volatile__("cld; rep movsl" ::"D" (CONFIG_CARBASE), "S" (CONFIG_CARBASE), "c" (CONFIG_CARSIZE/4): "memory");
 	__asm__ __volatile__ ("wbinvd\n");
 	banner(BIOS_DEBUG, "Disable_car: done wbinvd");
 	banner(BIOS_DEBUG, "disable_car: done");