- Let AMD CAR code pick the right XIP area

  for tinybootblock
- move asus/m2v-mx_se to tinybootblock
- Add romstrap for via southbridge to tinybootblock-bootblock

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4999 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/i386/Makefile.tinybootblock.inc b/src/arch/i386/Makefile.tinybootblock.inc
index 4aa6a84740c5b6a14e5d5aa361ef3af129352b38..720ce583aa1fccf006afba5c307aa7e140e0af0f 100644 (file)
--- a/src/arch/i386/Makefile.tinybootblock.inc
+++ b/src/arch/i386/Makefile.tinybootblock.inc
@@ -24,12 +24,20 @@ bootblock_lds := $(src)/arch/i386/init/ldscript_failover.lb
 bootblock_lds += $(src)/cpu/x86/16bit/entry16.lds
 bootblock_lds += $(src)/cpu/x86/16bit/reset16.lds
 bootblock_lds += $(src)/arch/i386/lib/id.lds
+ifeq ($(CONFIG_SOUTHBRIDGE_VIA_K8T890),y)
+bootblock_lds += $(src)/southbridge/via/k8t890/romstrap.lds
+endif
 
 bootblock_inc := $(src)/arch/i386/init/bootblock_prologue.c
 bootblock_inc += $(src)/cpu/x86/16bit/entry16.inc
 bootblock_inc += $(src)/cpu/x86/16bit/reset16.inc
 bootblock_inc += $(src)/cpu/x86/32bit/entry32.inc
 bootblock_inc += $(src)/arch/i386/lib/id.inc
+
+ifeq ($(CONFIG_SOUTHBRIDGE_VIA_K8T890),y)
+bootblock_inc += $(src)/southbridge/via/k8t890/romstrap.inc
+endif
+
 ifeq ($(CONFIG_SSE),y)
 bootblock_inc += $(src)/cpu/x86/sse_enable.inc
 endif

diff --git a/src/cpu/amd/car/cache_as_ram.inc b/src/cpu/amd/car/cache_as_ram.inc
index fa595f94e5175bc7f89ddf357e9d2142dc8276fd..b4de775b02cf8fbbb72133f09e9aac91bcc462ef 100644 (file)
--- a/src/cpu/amd/car/cache_as_ram.inc
+++ b/src/cpu/amd/car/cache_as_ram.inc
@@ -264,7 +264,14 @@ clear_fixed_var_mtrr_out:
         */
        movl    $0x202, %ecx
        xorl    %edx, %edx
-       movl    $(CONFIG_XIP_ROM_BASE | MTRR_TYPE_WRBACK), %eax
+
+#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
+#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
+#else
+#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
+#endif
+       movl    $REAL_XIP_ROM_BASE, %eax
+       orl     $MTRR_TYPE_WRBACK, %eax
        wrmsr
 
        movl    $0x203, %ecx

diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 3e687ee717048211e424a6998fe3a27fb4c9ce1f..e496e6aee2522cbc6c073bd8e55dee8a3321019d 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -35,6 +35,8 @@ config BOARD_ASUS_M2V_MX_SE
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_512
        select VGA
+       select TINY_BOOTBLOCK
+       select HAVE_MAINBOARD_RESOURCES
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc
index 4ae1e1f6ce6185e294955458075b49318a03cdae..78fb8aa696df1d4bdcc18077019d21790d66c1b5 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Makefile.inc
+++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc
@@ -30,20 +30,12 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 
 initobj-y += crt0.o
 # FIXME in $(top)/Makefile
-crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
-crt0-y += ../../../../src/southbridge/via/k8t890/romstrap.inc
 crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
-crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
-crt0-y += ../../../../src/arch/i386/lib/id.inc
 crt0-y += ../../../../src/cpu/amd/car/cache_as_ram.inc
 crt0-y += auto.inc
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds
-ldscript-y += ../../../../src/southbridge/via/k8t890/romstrap.lds
-ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds
-ldscript-y += ../../../../src/arch/i386/lib/id.lds
-ldscript-y += ../../../../src/arch/i386/lib/failover.lds
+ldscript-y += ../../../../src/cpu/x86/32bit/entry32.lds
 
 ifdef POST_EVALUATION