[commit] r5409 - in trunk/src: . cpu/via/car cpu/x86 mainboard/via/vt8454c

[repository service]

Author: oxygene
Date: Mon Apr 12 11:50:53 2010
New Revision: 5409
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5409

Log:
- move the XIP_ROM_* flags to src/cpu/x86/Kconfig exclusively
- set them to span the last 64k, instead of the last 128k
  by default
- fixes via CAR for tiny bootblock
- enabled tiny bootblock for via/vt8454c

Signed-off-by: Patrick Georgi 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/Kconfig
   trunk/src/cpu/via/car/cache_as_ram.inc
   trunk/src/cpu/x86/Kconfig
   trunk/src/mainboard/via/vt8454c/Kconfig

Modified: trunk/src/Kconfig
==============================================================================
--- trunk/src/Kconfig	Sun Apr 11 22:04:50 2010	(r5408)
+++ trunk/src/Kconfig	Mon Apr 12 11:50:53 2010	(r5409)
@@ -116,14 +116,6 @@
    int
    default 36

-config XIP_ROM_BASE
-	hex
-	default 0xfffe0000
-
-config XIP_ROM_SIZE
-	hex
-	default 0x20000
-
 config LOGICAL_CPUS
    bool
    default y

Modified: trunk/src/cpu/via/car/cache_as_ram.inc
==============================================================================
--- trunk/src/cpu/via/car/cache_as_ram.inc	Sun Apr 11 22:04:50 2010	(r5408)
+++ trunk/src/cpu/via/car/cache_as_ram.inc	Mon Apr 12 11:50:53 2010	(r5409)
@@ -139,7 +139,7 @@
    xorl	$0x5c5c5c5c,%eax
    rep	stosl

-	movl	CONFIG_XIP_ROM_BASE, %esi
+	movl	REAL_XIP_ROM_BASE, %esi
    movl	%esi, %edi
    movl	$(CONFIG_XIP_ROM_SIZE>>2), %ecx
    rep	lodsl
@@ -241,10 +241,10 @@
    movl    $((~(( 0 + 0x40000) - 1)) | 0x800), %eax
    wrmsr        
    
-	/* cache CONFIG_XIP_ROM_BASE-SIZE to speedup coreboot code */
+	/* cache XIP_ROM_BASE-SIZE to speedup coreboot code */
    movl    $0x206, %ecx
    xorl    %edx, %edx
-	movl     $CONFIG_XIP_ROM_BASE,%eax
+	movl     $REAL_XIP_ROM_BASE,%eax
    orl     $(0 | 6), %eax
    wrmsr

Modified: trunk/src/cpu/x86/Kconfig
==============================================================================
--- trunk/src/cpu/x86/Kconfig	Sun Apr 11 22:04:50 2010	(r5408)
+++ trunk/src/cpu/x86/Kconfig	Mon Apr 12 11:50:53 2010	(r5409)
@@ -25,8 +25,8 @@

config XIP_ROM_BASE
    hex
-	default 0xfffe0000
+	default 0xffff0000

config XIP_ROM_SIZE
    hex
-	default 0x20000
+	default 0x10000

Modified: trunk/src/mainboard/via/vt8454c/Kconfig
==============================================================================
--- trunk/src/mainboard/via/vt8454c/Kconfig	Sun Apr 11 22:04:50 2010	(r5408)
+++ trunk/src/mainboard/via/vt8454c/Kconfig	Mon Apr 12 11:50:53 2010	(r5409)
@@ -12,6 +12,7 @@
    select HAVE_ACPI_TABLES
    select BOARD_ROMSIZE_KB_512
    select USE_DCACHE_RAM
+	select TINY_BOOTBLOCK

config MAINBOARD_DIR
    string