diff options
| -rw-r--r-- | src/arch/i386/Kconfig | 8 | ||||
| -rw-r--r-- | src/cpu/amd/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/amd/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/cpu/x86/tsc/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/mainboard/amd/rumba/Kconfig | 7 | ||||
| -rw-r--r-- | src/northbridge/amd/Kconfig | 5 | ||||
| -rw-r--r-- | src/southbridge/amd/Kconfig | 2 |
7 files changed, 15 insertions, 14 deletions
diff --git a/src/arch/i386/Kconfig b/src/arch/i386/Kconfig index 4dc032110c..2e2f650f06 100644 --- a/src/arch/i386/Kconfig +++ b/src/arch/i386/Kconfig @@ -4,6 +4,14 @@ config ARCH_X86 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 diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig index eaad9ed94e..18ed8062c5 100644 --- a/src/cpu/amd/Kconfig +++ b/src/cpu/amd/Kconfig @@ -8,3 +8,4 @@ source src/cpu/amd/socket_F/Kconfig source src/cpu/amd/socket_S1G1/Kconfig source src/cpu/amd/model_fxx/Kconfig +source src/cpu/amd/model_gx2/Kconfig diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc index 9afb75f7a2..d484f10e98 100644 --- a/src/cpu/amd/Makefile.inc +++ b/src/cpu/amd/Makefile.inc @@ -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 diff --git a/src/cpu/x86/tsc/Makefile.inc b/src/cpu/x86/tsc/Makefile.inc index 408105ef96..ba2732c795 100644 --- a/src/cpu/x86/tsc/Makefile.inc +++ b/src/cpu/x86/tsc/Makefile.inc @@ -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 diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig index 82d466746b..220d067b63 100644 --- a/src/mainboard/amd/rumba/Kconfig +++ b/src/mainboard/amd/rumba/Kconfig @@ -26,6 +26,7 @@ config BOARD_AMD_RUMBA 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 @@ config USE_INIT int default 0 depends on BOARD_AMD_RUMBA - - -config TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 - int - default 0 - depends on BOARD_AMD_RUMBA diff --git a/src/northbridge/amd/Kconfig b/src/northbridge/amd/Kconfig index 30c9070c8c..b86d240a0b 100644 --- a/src/northbridge/amd/Kconfig +++ b/src/northbridge/amd/Kconfig @@ -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 diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig index 9ed63fe123..dc32d217f8 100644 --- a/src/southbridge/amd/Kconfig +++ b/src/southbridge/amd/Kconfig @@ -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 |