From 178f27bc316fad332069d4373db579468340f164 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Fri, 1 Aug 2008 17:16:45 +0000 Subject: [PATCH] v3: Clean up a Kconfig value and fixup K8 CAR defines to get CONFIG_ values Signed-off-by: Peter Stuge Acked-by: Ronald G. Minnich git-svn-id: svn://coreboot.org/repository/coreboot-v3@703 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- arch/x86/Kconfig | 2 +- arch/x86/amd/stage0.S | 4 ++-- arch/x86/amdk8/stage1.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f5d2b50f96..e98dde245a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -90,6 +90,6 @@ config CARSIZE 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. diff --git a/arch/x86/amd/stage0.S b/arch/x86/amd/stage0.S index 35fbfdf15c..2ec3d73710 100644 --- a/arch/x86/amd/stage0.S +++ b/arch/x86/amd/stage0.S @@ -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 diff --git a/arch/x86/amdk8/stage1.c b/arch/x86/amdk8/stage1.c index 80c3b6d139..24133d35e7 100644 --- a/arch/x86/amdk8/stage1.c +++ b/arch/x86/amdk8/stage1.c @@ -35,7 +35,7 @@ void disable_car(void) * 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");