Kyösti Mälkki (kyosti.mal...@gmail.com) just uploaded a new patch set to
gerrit, which you can find at http://review.coreboot.org/1184
-gerrit
commit 5f8eb595cd8cf9c39da83e85dd9ff6284866bfc1
Author: Kyösti Mälkki <kyosti.mal...@gmail.com>
Date: Sat Jul 7 13:42:03 2012 +0300
Move cpus_ready_for_init() to AMD K8
The function is a noop for all but amd/serengeti_cheetah.
Change-Id: I09e2e710aa964c2f31e35fcea4f14856cc1e1dca
Signed-off-by: Kyösti Mälkki <kyosti.mal...@gmail.com>
---
src/cpu/x86/Kconfig | 4 ----
src/cpu/x86/lapic/lapic_cpu_init.c | 2 --
src/include/cpu/cpu.h | 6 ------
src/mainboard/amd/pistachio/Kconfig | 1 -
src/mainboard/ibm/e325/Kconfig | 1 -
src/mainboard/ibm/e326/Kconfig | 1 -
src/mainboard/iwill/dk8_htx/Kconfig | 1 -
src/mainboard/iwill/dk8s2/Kconfig | 1 -
src/mainboard/iwill/dk8x/Kconfig | 1 -
src/mainboard/msi/ms9652_fam10/Kconfig | 4 ----
src/mainboard/technexion/tim8690/Kconfig | 1 -
src/northbridge/amd/amdk8/Kconfig | 4 ++++
src/northbridge/amd/amdk8/amdk8.h | 2 ++
src/northbridge/amd/amdk8/northbridge.c | 3 +++
14 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index de40c05..d7240de 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -1,7 +1,3 @@
-config WAIT_BEFORE_CPUS_INIT
- bool
- default n
-
config UDELAY_IO
bool
default y if !UDELAY_LAPIC && !UDELAY_TSC
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c
b/src/cpu/x86/lapic/lapic_cpu_init.c
index b6dc560..302eeba 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -286,8 +286,6 @@ void initialize_cpus(struct bus *cpu_bus)
smm_init();
#endif
- cpus_ready_for_init();
-
/* Initialize the bootstrap processor */
cpu_initialize(cpu_bus, 0);
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index 9765dfd..90e4620 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -11,12 +11,6 @@ void secondary_cpu_init(int index);
extern unsigned int cpucount;
-#if !CONFIG_WAIT_BEFORE_CPUS_INIT
- #define cpus_ready_for_init() do {} while(0)
-#else
- void cpus_ready_for_init(void);
-#endif
-
#if CONFIG_HAVE_SMI_HANDLER
void smm_init(void);
void smm_lock(void);
diff --git a/src/mainboard/amd/pistachio/Kconfig
b/src/mainboard/amd/pistachio/Kconfig
index d140878..a83fbcf 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
- select WAIT_BEFORE_CPUS_INIT
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig
index 9ef4c48..839ea8f 100644
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
- select WAIT_BEFORE_CPUS_INIT
select BOARD_ROMSIZE_KB_512
select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig
index 475cb85..ac52534 100644
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
- select WAIT_BEFORE_CPUS_INIT
select BOARD_ROMSIZE_KB_512
select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig
b/src/mainboard/iwill/dk8_htx/Kconfig
index 5ad70f3..5f9920a 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE
select LIFT_BSP_APIC_ID
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
- select WAIT_BEFORE_CPUS_INIT
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
diff --git a/src/mainboard/iwill/dk8s2/Kconfig
b/src/mainboard/iwill/dk8s2/Kconfig
index 7fda0a6..f13d06a 100644
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_OPTION_TABLE
select HAVE_MP_TABLE
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
- select WAIT_BEFORE_CPUS_INIT
select DRIVERS_ATI_RAGEXL
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index 452b6e6..a17f104 100644
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
- select WAIT_BEFORE_CPUS_INIT
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig
b/src/mainboard/msi/ms9652_fam10/Kconfig
index a1f69c8..0856ff8 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -157,10 +157,6 @@ config MEM_TRAIN_SEQ
int
default 2
-config WAIT_BEFORE_CPUS_INIT
- bool
- default n
-
config AMD_UCODE_PATCH_FILE
string
default "mc_patch_01000096.h"
diff --git a/src/mainboard/technexion/tim8690/Kconfig
b/src/mainboard/technexion/tim8690/Kconfig
index 293590c..6bfa814 100644
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
- select WAIT_BEFORE_CPUS_INIT
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
diff --git a/src/northbridge/amd/amdk8/Kconfig
b/src/northbridge/amd/amdk8/Kconfig
index 70e75e9..9ea5404 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -33,6 +33,10 @@ config K8_HT_FREQ_1G_SUPPORT
bool
default n
+config WAIT_BEFORE_CPUS_INIT
+ bool
+ default n
+
config MEM_TRAIN_SEQ
int
default 0
diff --git a/src/northbridge/amd/amdk8/amdk8.h
b/src/northbridge/amd/amdk8/amdk8.h
index 5aa3b31..e001706 100644
--- a/src/northbridge/amd/amdk8/amdk8.h
+++ b/src/northbridge/amd/amdk8/amdk8.h
@@ -14,4 +14,6 @@ void setup_resource_map_offset(const unsigned int
*register_values, int max, uns
void fill_mem_ctrl(int controllers, struct mem_controller *ctrl_a, const
uint16_t *spd_addr);
#endif
+void cpus_ready_for_init(void);
+
#endif /* AMDK8_H */
diff --git a/src/northbridge/amd/amdk8/northbridge.c
b/src/northbridge/amd/amdk8/northbridge.c
index 5eeeda2..cf80389 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1331,6 +1331,9 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
static void cpu_bus_init(device_t dev)
{
+#if CONFIG_WAIT_BEFORE_CPUS_INIT
+ cpus_ready_for_init();
+#endif
initialize_cpus(dev->link_list);
}
--
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot
