Author: oxygene Date: 2010-01-05 18:35:44 +0100 (Tue, 05 Jan 2010) New Revision: 4999
Modified: trunk/src/arch/i386/Makefile.tinybootblock.inc trunk/src/cpu/amd/car/cache_as_ram.inc trunk/src/mainboard/asus/m2v-mx_se/Kconfig trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc Log: - 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
Modified: trunk/src/arch/i386/Makefile.tinybootblock.inc =================================================================== --- trunk/src/arch/i386/Makefile.tinybootblock.inc 2010-01-05 13:03:02 UTC (rev 4998) +++ trunk/src/arch/i386/Makefile.tinybootblock.inc 2010-01-05 17:35:44 UTC (rev 4999) @@ -24,12 +24,20 @@ 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
Modified: trunk/src/cpu/amd/car/cache_as_ram.inc =================================================================== --- trunk/src/cpu/amd/car/cache_as_ram.inc 2010-01-05 13:03:02 UTC (rev 4998) +++ trunk/src/cpu/amd/car/cache_as_ram.inc 2010-01-05 17:35:44 UTC (rev 4999) @@ -264,7 +264,14 @@ */ 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
Modified: trunk/src/mainboard/asus/m2v-mx_se/Kconfig =================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/Kconfig 2010-01-05 13:03:02 UTC (rev 4998) +++ trunk/src/mainboard/asus/m2v-mx_se/Kconfig 2010-01-05 17:35:44 UTC (rev 4999) @@ -35,6 +35,8 @@ select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 select VGA + select TINY_BOOTBLOCK + select HAVE_MAINBOARD_RESOURCES
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc =================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc 2010-01-05 13:03:02 UTC (rev 4998) +++ trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc 2010-01-05 17:35:44 UTC (rev 4999) @@ -30,20 +30,12 @@
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