sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Let AMD CAR code pick the right XIP area

Browse Source 
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
This commit is contained in:
Rudolf Marek 2010-01-05 17:35:44 +00:00 committed by Patrick Georgi
parent a0c68f864e
commit 95c50c6091
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/i386/Makefile.tinybootblock.inc
View File

@ -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/entry16.lds
bootblock_lds += $(src)/cpu/x86/16bit/reset16.lds bootblock_lds += $(src)/cpu/x86/16bit/reset16.lds
bootblock_lds += $(src)/arch/i386/lib/id.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)/arch/i386/init/bootblock_prologue.c
bootblock_inc += $(src)/cpu/x86/16bit/entry16.inc bootblock_inc += $(src)/cpu/x86/16bit/entry16.inc
bootblock_inc += $(src)/cpu/x86/16bit/reset16.inc bootblock_inc += $(src)/cpu/x86/16bit/reset16.inc
bootblock_inc += $(src)/cpu/x86/32bit/entry32.inc bootblock_inc += $(src)/cpu/x86/32bit/entry32.inc
bootblock_inc += $(src)/arch/i386/lib/id.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) ifeq ($(CONFIG_SSE),y)
bootblock_inc += $(src)/cpu/x86/sse_enable.inc bootblock_inc += $(src)/cpu/x86/sse_enable.inc
endif endif

9
src/cpu/amd/car/cache_as_ram.inc
View File

@ -264,7 +264,14 @@ clear_fixed_var_mtrr_out:
*/ */
movl $0x202, %ecx movl $0x202, %ecx
xorl %edx, %edx 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 wrmsr
movl $0x203, %ecx movl $0x203, %ecx

2
src/mainboard/asus/m2v-mx_se/Kconfig
View File

@ -35,6 +35,8 @@ config BOARD_ASUS_M2V_MX_SE
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512 select BOARD_ROMSIZE_KB_512
select VGA select VGA
select TINY_BOOTBLOCK
select HAVE_MAINBOARD_RESOURCES
config MAINBOARD_DIR config MAINBOARD_DIR
string string

10
src/mainboard/asus/m2v-mx_se/Makefile.inc
View File

@ -30,20 +30,12 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
initobj-y += crt0.o initobj-y += crt0.o
# FIXME in $(top)/Makefile # 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/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 += ../../../../src/cpu/amd/car/cache_as_ram.inc
crt0-y += auto.inc crt0-y += auto.inc
ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds ldscript-y += ../../../../src/cpu/x86/32bit/entry32.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
ifdef POST_EVALUATION ifdef POST_EVALUATION