diff options
| author | Rudolf Marek <r.marek@assembler.cz> | 2010-01-05 17:35:44 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-01-05 17:35:44 +0000 |
| commit | 95c50c6091cdc700c79da832f61b2a94b3e5c87c (patch) | |
| tree | f5899737c5acca1972eeb241ffb1791c5e99fafa | |
| parent | a0c68f864e9095a94c684183deb41f706e0bd1c3 (diff) | |
| download | coreboot-95c50c6091cdc700c79da832f61b2a94b3e5c87c.tar.gz coreboot-95c50c6091cdc700c79da832f61b2a94b3e5c87c.tar.bz2 coreboot-95c50c6091cdc700c79da832f61b2a94b3e5c87c.zip | |
- 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
| -rw-r--r-- | src/arch/i386/Makefile.tinybootblock.inc | 8 | ||||
| -rw-r--r-- | src/cpu/amd/car/cache_as_ram.inc | 9 | ||||
| -rw-r--r-- | src/mainboard/asus/m2v-mx_se/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/asus/m2v-mx_se/Makefile.inc | 10 |
4 files changed, 19 insertions, 10 deletions
diff --git a/src/arch/i386/Makefile.tinybootblock.inc b/src/arch/i386/Makefile.tinybootblock.inc index 4aa6a84740c5..720ce583aa1f 100644 --- 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 fa595f94e517..b4de775b02cf 100644 --- 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 3e687ee71704..e496e6aee252 100644 --- 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 4ae1e1f6ce61..78fb8aa696df 100644 --- 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 |