From 8560db611608cbe0e344c1a301cf23e4c1fb36c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 3 Jul 2019 06:08:13 +0300 Subject: amdfam10: Declare empty activate_spd_rom() stub MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1d0940a08f7ae5901b812618a6859c4297274591 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/33994 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Angel Pons --- src/mainboard/advansus/a785e-i/romstage.c | 4 ---- src/mainboard/amd/bimini_fam10/romstage.c | 4 ---- src/mainboard/amd/mahogany_fam10/romstage.c | 2 -- src/mainboard/amd/serengeti_cheetah_fam10/romstage.c | 1 - src/mainboard/amd/tilapia_fam10/romstage.c | 2 -- src/mainboard/asus/kcma-d8/romstage.c | 1 - src/mainboard/asus/kfsn4-dre/romstage.c | 4 ++-- src/mainboard/asus/kgpe-d16/romstage.c | 4 ++-- src/mainboard/asus/m4a78-em/romstage.c | 2 -- src/mainboard/asus/m4a785-m/romstage.c | 2 -- src/mainboard/asus/m5a88-v/romstage.c | 4 ---- src/mainboard/avalue/eax-785e/romstage.c | 4 ---- src/mainboard/gigabyte/ma785gm/romstage.c | 2 -- src/mainboard/gigabyte/ma785gmt/romstage.c | 2 -- src/mainboard/gigabyte/ma78gm/romstage.c | 2 -- src/mainboard/hp/dl165_g6_fam10/romstage.c | 3 +-- src/mainboard/iei/kino-780am2-fam10/romstage.c | 2 -- src/mainboard/jetway/pa78vm5/romstage.c | 2 -- src/mainboard/msi/ms9652_fam10/romstage.c | 2 -- src/mainboard/supermicro/h8dmr_fam10/romstage.c | 2 -- src/mainboard/supermicro/h8qme_fam10/romstage.c | 3 +-- src/mainboard/supermicro/h8scm_fam10/romstage.c | 4 ---- src/mainboard/tyan/s2912_fam10/romstage.c | 2 -- src/northbridge/amd/amdfam10/raminit.h | 2 ++ src/northbridge/amd/amdfam10/raminit_amdmct.c | 5 ++++- 25 files changed, 12 insertions(+), 55 deletions(-) diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c index 4a817cf844..d8e618570f 100644 --- a/src/mainboard/advansus/a785e-i/romstage.c +++ b/src/mainboard/advansus/a785e-i/romstage.c @@ -45,13 +45,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) -{ -} int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c index 7b2f0513a4..e9d391cb0a 100644 --- a/src/mainboard/amd/bimini_fam10/romstage.c +++ b/src/mainboard/amd/bimini_fam10/romstage.c @@ -41,13 +41,9 @@ #include "cpu/amd/quadcore/quadcore.c" -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) -{ -} int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c index c73eb0d388..2376414206 100644 --- a/src/mainboard/amd/mahogany_fam10/romstage.c +++ b/src/mainboard/amd/mahogany_fam10/romstage.c @@ -45,11 +45,9 @@ #include "cpu/amd/quadcore/quadcore.c" -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c index a525154eb3..1ba65427c2 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c @@ -41,7 +41,6 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c index a45d8f6510..9aa59b285a 100644 --- a/src/mainboard/amd/tilapia_fam10/romstage.c +++ b/src/mainboard/amd/tilapia_fam10/romstage.c @@ -43,11 +43,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c index 6c40627823..4bcfeddf53 100644 --- a/src/mainboard/asus/kcma-d8/romstage.c +++ b/src/mainboard/asus/kcma-d8/romstage.c @@ -50,7 +50,6 @@ #define SERIAL_0_DEV PNP_DEV(0x2e, W83667HG_A_SP1) #define SERIAL_1_DEV PNP_DEV(0x2e, W83667HG_A_SP2) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c index dbf704b288..817e6db22a 100644 --- a/src/mainboard/asus/kfsn4-dre/romstage.c +++ b/src/mainboard/asus/kfsn4-dre/romstage.c @@ -53,7 +53,6 @@ #define GPIO3_DEV PNP_DEV(0x2e, W83627THG_GPIO3) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; @@ -170,7 +169,8 @@ static const uint8_t spd_addr[] = { RC01, DIMM0, DIMM2, DIMM4, DIMM6, DIMM1, DIMM3, DIMM5, DIMM7, }; -void activate_spd_rom(const struct mem_controller *ctrl) { +void activate_spd_rom(const struct mem_controller *ctrl) +{ printk(BIOS_DEBUG, "activate_spd_rom() for node %02x\n", ctrl->node_id); if (ctrl->node_id == 0) { printk(BIOS_DEBUG, "enable_spd_node0()\n"); diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c index d017b0616a..85ad0b6f64 100644 --- a/src/mainboard/asus/kgpe-d16/romstage.c +++ b/src/mainboard/asus/kgpe-d16/romstage.c @@ -51,7 +51,6 @@ #define SERIAL_0_DEV PNP_DEV(0x2e, W83667HG_A_SP1) #define SERIAL_1_DEV PNP_DEV(0x2e, W83667HG_A_SP2) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; @@ -179,7 +178,8 @@ static const uint8_t spd_addr_fam10[] = { RC01, DIMM0, DIMM1, 0, 0, DIMM2, DIMM3, 0, 0, }; -void activate_spd_rom(const struct mem_controller *ctrl) { +void activate_spd_rom(const struct mem_controller *ctrl) +{ struct sys_info *sysinfo = &sysinfo_car; printk(BIOS_DEBUG, "activate_spd_rom() for node %02x\n", ctrl->node_id); if (ctrl->node_id == 0) { diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c index c99179e48e..072b758bef 100644 --- a/src/mainboard/asus/m4a78-em/romstage.c +++ b/src/mainboard/asus/m4a78-em/romstage.c @@ -46,11 +46,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1) #define GPIO_DEV PNP_DEV(0x2e, IT8712F_GPIO) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c index 1d5921440d..c03115dc0b 100644 --- a/src/mainboard/asus/m4a785-m/romstage.c +++ b/src/mainboard/asus/m4a785-m/romstage.c @@ -46,11 +46,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1) #define GPIO_DEV PNP_DEV(0x2e, IT8712F_GPIO) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c index 9216ecb910..ad05371367 100644 --- a/src/mainboard/asus/m5a88-v/romstage.c +++ b/src/mainboard/asus/m5a88-v/romstage.c @@ -46,13 +46,9 @@ #define SERIAL_DEV PNP_DEV(0x4e, IT8721F_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) -{ -} int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c index 934791926c..2d3c762c1a 100644 --- a/src/mainboard/avalue/eax-785e/romstage.c +++ b/src/mainboard/avalue/eax-785e/romstage.c @@ -45,13 +45,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #define CLK_DEV PNP_DEV(0x2e, W83627HF_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) -{ -} int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c index 4ca318a4d8..cbcb54d709 100644 --- a/src/mainboard/gigabyte/ma785gm/romstage.c +++ b/src/mainboard/gigabyte/ma785gm/romstage.c @@ -46,11 +46,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) #define GPIO_DEV PNP_DEV(0x2e, IT8718F_GPIO) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c index 746be76642..2af958b335 100644 --- a/src/mainboard/gigabyte/ma785gmt/romstage.c +++ b/src/mainboard/gigabyte/ma785gmt/romstage.c @@ -46,11 +46,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) #define GPIO_DEV PNP_DEV(0x2e, IT8718F_GPIO) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c index 4d23bac7b8..4a28a2edbb 100644 --- a/src/mainboard/gigabyte/ma78gm/romstage.c +++ b/src/mainboard/gigabyte/ma78gm/romstage.c @@ -46,11 +46,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) #define GPIO_DEV PNP_DEV(0x2e, IT8718F_GPIO) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c index c02b0e624e..94489c4ca3 100644 --- a/src/mainboard/hp/dl165_g6_fam10/romstage.c +++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c @@ -52,11 +52,10 @@ #define SERIAL_DEV PNP_DEV(0x2e, PILOT_SP1) #define RTC_DEV PNP_DEV(0x4e, PC87417_RTC) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -inline void activate_spd_rom(const struct mem_controller *ctrl) +void activate_spd_rom(const struct mem_controller *ctrl) { u8 val; outb(0x3d, 0x0cd6); diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c index 421e613072..fa578942ad 100644 --- a/src/mainboard/iei/kino-780am2-fam10/romstage.c +++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c @@ -45,11 +45,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, F71859_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c index 7fcb594391..8296b4c1c5 100644 --- a/src/mainboard/jetway/pa78vm5/romstage.c +++ b/src/mainboard/jetway/pa78vm5/romstage.c @@ -50,11 +50,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, F71863FG_SP1) #endif -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index 2da427d710..ecb3ab9a0f 100644 --- a/src/mainboard/msi/ms9652_fam10/romstage.c +++ b/src/mainboard/msi/ms9652_fam10/romstage.c @@ -44,11 +44,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627EHG_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } inline int spd_read_byte(unsigned int device, unsigned int address) { diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c index 4d6846c2de..c6f5d63b9f 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c +++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c @@ -47,11 +47,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #define SUPERIO_DEV PNP_DEV(0x2e, 0) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } inline int spd_read_byte(unsigned int device, unsigned int address) { diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c index 051cd61efb..87957e9443 100644 --- a/src/mainboard/supermicro/h8qme_fam10/romstage.c +++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c @@ -50,11 +50,10 @@ #define SMBUS_SWITCH1 0x70 #define SMBUS_SWITCH2 0x72 -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -inline void activate_spd_rom(const struct mem_controller *ctrl) +void activate_spd_rom(const struct mem_controller *ctrl) { smbus_send_byte(SMBUS_SWITCH1, 5 & 0x0f); smbus_send_byte(SMBUS_SWITCH2, (5 >> 4) & 0x0f); diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c index f3958f8d61..93dca0293c 100644 --- a/src/mainboard/supermicro/h8scm_fam10/romstage.c +++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c @@ -42,13 +42,9 @@ #include "cpu/amd/quadcore/quadcore.c" -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) -{ -} int spd_read_byte(u32 device, u32 address) { diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index 3f504e1957..85824aa494 100644 --- a/src/mainboard/tyan/s2912_fam10/romstage.c +++ b/src/mainboard/tyan/s2912_fam10/romstage.c @@ -43,11 +43,9 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) -void activate_spd_rom(const struct mem_controller *ctrl); int spd_read_byte(unsigned int device, unsigned int address); extern struct sys_info sysinfo_car; -void activate_spd_rom(const struct mem_controller *ctrl) { } inline int spd_read_byte(unsigned int device, unsigned int address) { diff --git a/src/northbridge/amd/amdfam10/raminit.h b/src/northbridge/amd/amdfam10/raminit.h index 029fa0e32a..9d1d91d536 100644 --- a/src/northbridge/amd/amdfam10/raminit.h +++ b/src/northbridge/amd/amdfam10/raminit.h @@ -24,6 +24,8 @@ struct sys_info; struct DCTStatStruc; struct MCTStatStruc; +void activate_spd_rom(const struct mem_controller *ctrl); + int mctRead_SPD(u32 smaddr, u32 reg); void mctSMBhub_Init(u32 node); void mctGet_DIMMAddr(struct DCTStatStruc *pDCTstat, u32 node); diff --git a/src/northbridge/amd/amdfam10/raminit_amdmct.c b/src/northbridge/amd/amdfam10/raminit_amdmct.c index 4f31a5e848..1f2b51d8bf 100644 --- a/src/northbridge/amd/amdfam10/raminit_amdmct.c +++ b/src/northbridge/amd/amdfam10/raminit_amdmct.c @@ -32,9 +32,12 @@ struct sys_info sysinfo_car CAR_GLOBAL; struct mem_controller; -extern void activate_spd_rom(const struct mem_controller *ctrl); extern int spd_read_byte(unsigned int device, unsigned int address); +void __weak activate_spd_rom(const struct mem_controller *ctrl) +{ +} + void fam15h_switch_dct(uint32_t dev, uint8_t dct) { uint32_t dword; -- cgit v1.2.3