- 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 <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5409 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index fec4d0be49337c14102c311dffcb819019846f7e..f59914f6a42ce20f25aecd14b4cbc70131a9e6ea 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -116,14 +116,6 @@ config CPU_ADDR_BITS
        int
        default 36
 
-config XIP_ROM_BASE
-       hex
-       default 0xfffe0000
-
-config XIP_ROM_SIZE
-       hex
-       default 0x20000
-
 config LOGICAL_CPUS
        bool
        default y

diff --git a/src/cpu/via/car/cache_as_ram.inc b/src/cpu/via/car/cache_as_ram.inc
index 7eb85333acf0c742a9d185be52129366013a1752..c926ab6f91627199139e1922ab81db0a3ffed687 100644 (file)
--- a/src/cpu/via/car/cache_as_ram.inc
+++ b/src/cpu/via/car/cache_as_ram.inc
@@ -139,7 +139,7 @@ clear_fixed_var_mtrr_out:
        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 @@ testok:   movb $0x40,%al
        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
 

diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 59f27de7940b8943c483c3500ffb39a88dbf603e..325991e28e4aecda3069c174d547feb3b37d12fc 100644 (file)
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -25,8 +25,8 @@ config TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config XIP_ROM_BASE
        hex
-       default 0xfffe0000
+       default 0xffff0000
 
 config XIP_ROM_SIZE
        hex
-       default 0x20000
+       default 0x10000

diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig
index f575e8098f64538a965cfda49262016cab22a7f7..62b3cd092efd6e4e9595e13c41e56d85d6097aa6 100644 (file)
--- a/src/mainboard/via/vt8454c/Kconfig
+++ b/src/mainboard/via/vt8454c/Kconfig
@@ -12,6 +12,7 @@ config BOARD_VIA_VT8454C
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_512
        select USE_DCACHE_RAM
+       select TINY_BOOTBLOCK
 
 config MAINBOARD_DIR
        string