Author: rminnich Date: 2009-08-29 04:59:35 +0200 (Sat, 29 Aug 2009) New Revision: 4618
Modified: trunk/coreboot-v2/src/arch/i386/Kconfig trunk/coreboot-v2/src/cpu/amd/Kconfig trunk/coreboot-v2/src/cpu/amd/Makefile.inc trunk/coreboot-v2/src/cpu/x86/tsc/Makefile.inc trunk/coreboot-v2/src/mainboard/amd/rumba/Kconfig trunk/coreboot-v2/src/northbridge/amd/Kconfig trunk/coreboot-v2/src/southbridge/amd/Kconfig Log: This is the final set of changes to allow rumba to build. Rumba is not tested. I also addressed questions raised by Uwe: TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 UDELAY_TSC
Are now defined as booleans in src/cpu/x86/Kconfig and can be selected in the mainboard Kconfig. The remaining question of Uwe's is a deeper problem:
--- We'll have to check if this works. From a quick glance the Rumba does not have the mmx related lines (which _are_ in Makefile.romccboard.inc, though):
crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc crt0-y += ../../../../src/cpu/x86/mmx/enable_mmx.inc crt0-y += auto.inc crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc ---
We're going to need a whole variant of this standard mainboard OR we're going to have to make (some) of the unconditional includes above conditional.
Signed-off-by: Ronald G. Minnich rminnich@gmail.com Acked-by: Myles Watson mylesgw@gmail.com
Modified: trunk/coreboot-v2/src/arch/i386/Kconfig =================================================================== --- trunk/coreboot-v2/src/arch/i386/Kconfig 2009-08-29 02:47:57 UTC (rev 4617) +++ trunk/coreboot-v2/src/arch/i386/Kconfig 2009-08-29 02:59:35 UTC (rev 4618) @@ -4,6 +4,14 @@ This option is used to set the architecture of a mainboard. It is usually set in mainboard/*/Kconfig.
+config AP_IN_SIPI_WAIT + bool + default n + depends on ARCH_X86 + help + This is an SMP option. It relates to starting up APs. + It is usually set in mainboard/*/Kconfig. + config ARCH string default i386
Modified: trunk/coreboot-v2/src/cpu/amd/Kconfig =================================================================== --- trunk/coreboot-v2/src/cpu/amd/Kconfig 2009-08-29 02:47:57 UTC (rev 4617) +++ trunk/coreboot-v2/src/cpu/amd/Kconfig 2009-08-29 02:59:35 UTC (rev 4618) @@ -8,3 +8,4 @@ source src/cpu/amd/socket_S1G1/Kconfig
source src/cpu/amd/model_fxx/Kconfig +source src/cpu/amd/model_gx2/Kconfig
Modified: trunk/coreboot-v2/src/cpu/amd/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/cpu/amd/Makefile.inc 2009-08-29 02:47:57 UTC (rev 4617) +++ trunk/coreboot-v2/src/cpu/amd/Makefile.inc 2009-08-29 02:59:35 UTC (rev 4618) @@ -1,4 +1,5 @@ subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += socket_F subdirs-$(CONFIG_CPU_AMD_SOCKET_940) += socket_940 subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2) += socket_AM2 +subdirs-$(CONFIG_CPU_AMD_GX2) += model_gx2 subdirs-$(CONFIG_CPU_AMD_SOCKET_S1G1) += socket_S1G1
Modified: trunk/coreboot-v2/src/cpu/x86/tsc/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/cpu/x86/tsc/Makefile.inc 2009-08-29 02:47:57 UTC (rev 4617) +++ trunk/coreboot-v2/src/cpu/x86/tsc/Makefile.inc 2009-08-29 02:59:35 UTC (rev 4618) @@ -1,7 +1,2 @@ obj-y += delay_tsc.o
-# default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=0 -# if CONFIG_UDELAY_TSC -# default CONFIG_HAVE_INIT_TIMER=1 -# object delay_tsc.o -# end
Modified: trunk/coreboot-v2/src/mainboard/amd/rumba/Kconfig =================================================================== --- trunk/coreboot-v2/src/mainboard/amd/rumba/Kconfig 2009-08-29 02:47:57 UTC (rev 4617) +++ trunk/coreboot-v2/src/mainboard/amd/rumba/Kconfig 2009-08-29 02:59:35 UTC (rev 4618) @@ -26,6 +26,7 @@ select NORTHBRIDGE_AMD_GX2 select SOUTHBRIDGE_AMD_CS5536 select UDELAY_TSC + select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select HAVE_PIRQ_TABLE help AMD Rumba mainboard. @@ -54,9 +55,3 @@ int default 0 depends on BOARD_AMD_RUMBA - - -config TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 - int - default 0 - depends on BOARD_AMD_RUMBA
Modified: trunk/coreboot-v2/src/northbridge/amd/Kconfig =================================================================== --- trunk/coreboot-v2/src/northbridge/amd/Kconfig 2009-08-29 02:47:57 UTC (rev 4617) +++ trunk/coreboot-v2/src/northbridge/amd/Kconfig 2009-08-29 02:59:35 UTC (rev 4618) @@ -1,7 +1,8 @@ +source src/northbridge/amd/amdk8/Kconfig +source src/northbridge/amd/gx2/Kconfig + #source src/northbridge/amd/amdfam10/Kconfig #source src/northbridge/amd/amdht/Kconfig -source src/northbridge/amd/amdk8/Kconfig #source src/northbridge/amd/amdmct/Kconfig #source src/northbridge/amd/gx1/Kconfig -#source src/northbridge/amd/gx2/Kconfig #source src/northbridge/amd/lx/Kconfig
Modified: trunk/coreboot-v2/src/southbridge/amd/Kconfig =================================================================== --- trunk/coreboot-v2/src/southbridge/amd/Kconfig 2009-08-29 02:47:57 UTC (rev 4617) +++ trunk/coreboot-v2/src/southbridge/amd/Kconfig 2009-08-29 02:59:35 UTC (rev 4618) @@ -1,10 +1,10 @@ source src/southbridge/amd/amd8111/Kconfig source src/southbridge/amd/amd8131/Kconfig +source src/southbridge/amd/cs5536/Kconfig #source src/southbridge/amd/amd8131-disable/Kconfig #source src/southbridge/amd/amd8132/Kconfig #source src/southbridge/amd/amd8151/Kconfig #source src/southbridge/amd/cs5530/Kconfig #source src/southbridge/amd/cs5535/Kconfig -#source src/southbridge/amd/cs5536/Kconfig source src/southbridge/amd/rs690/Kconfig source src/southbridge/amd/sb600/Kconfig