aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/Kconfig2
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/bootblock.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index cdff24f868..43c42439e2 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -90,7 +90,7 @@ config HEAP_SIZE
hex
default 0xc0000
-config BOOTBLOCK_SOUTHBRIDGE_INIT
+config BOOTBLOCK_MAINBOARD_INIT
string
default "mainboard/hp/dl165_g6_fam10/bootblock.c"
diff --git a/src/mainboard/hp/dl165_g6_fam10/bootblock.c b/src/mainboard/hp/dl165_g6_fam10/bootblock.c
index 2c56c4ccf5..479e0b6bce 100644
--- a/src/mainboard/hp/dl165_g6_fam10/bootblock.c
+++ b/src/mainboard/hp/dl165_g6_fam10/bootblock.c
@@ -18,6 +18,9 @@ static inline void shc4307_exit_ext_func_mode(device_t dev)
#define DBG_DEV PNP_DEV(SCH4307_CONFIG_PORT, 0x3)
#define REGS_DEV PNP_DEV(SCH4307_CONFIG_PORT, 0xa)
+/* FIXME: This appears to be a super-io initialisation,
+ * placed in the mainboard directory.
+ */
void shc4307_init(void)
{
shc4307_enter_ext_func_mode(CMOS_DEV);
@@ -43,6 +46,9 @@ void shc4307_init(void)
shc4307_exit_ext_func_mode(CMOS_DEV);
}
-static void bootblock_southbridge_init(void) {
+static void bootblock_mainboard_init(void)
+{
+ bootblock_northbridge_init();
+ bootblock_southbridge_init();
shc4307_init();
}