amdfam10: Declare empty activate_spd_rom() stub

Change-Id: I1d0940a08f7ae5901b812618a6859c4297274591
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33994
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2019-07-03 06:08:13 +03:00
parent 6044be7f9e
commit 8560db6116
25 changed files with 12 additions and 55 deletions

View File

@ -45,13 +45,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl)
{
}
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -41,13 +41,9 @@
#include "cpu/amd/quadcore/quadcore.c" #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl)
{
}
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -45,11 +45,9 @@
#include "cpu/amd/quadcore/quadcore.c" #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -41,7 +41,6 @@
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;

View File

@ -43,11 +43,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -50,7 +50,6 @@
#define SERIAL_0_DEV PNP_DEV(0x2e, W83667HG_A_SP1) #define SERIAL_0_DEV PNP_DEV(0x2e, W83667HG_A_SP1)
#define SERIAL_1_DEV PNP_DEV(0x2e, W83667HG_A_SP2) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;

View File

@ -53,7 +53,6 @@
#define GPIO3_DEV PNP_DEV(0x2e, W83627THG_GPIO3) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; 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, 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); printk(BIOS_DEBUG, "activate_spd_rom() for node %02x\n", ctrl->node_id);
if (ctrl->node_id == 0) { if (ctrl->node_id == 0) {
printk(BIOS_DEBUG, "enable_spd_node0()\n"); printk(BIOS_DEBUG, "enable_spd_node0()\n");

View File

@ -51,7 +51,6 @@
#define SERIAL_0_DEV PNP_DEV(0x2e, W83667HG_A_SP1) #define SERIAL_0_DEV PNP_DEV(0x2e, W83667HG_A_SP1)
#define SERIAL_1_DEV PNP_DEV(0x2e, W83667HG_A_SP2) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; 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, 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; struct sys_info *sysinfo = &sysinfo_car;
printk(BIOS_DEBUG, "activate_spd_rom() for node %02x\n", ctrl->node_id); printk(BIOS_DEBUG, "activate_spd_rom() for node %02x\n", ctrl->node_id);
if (ctrl->node_id == 0) { if (ctrl->node_id == 0) {

View File

@ -46,11 +46,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1) #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1)
#define GPIO_DEV PNP_DEV(0x2e, IT8712F_GPIO) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -46,11 +46,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1) #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1)
#define GPIO_DEV PNP_DEV(0x2e, IT8712F_GPIO) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -46,13 +46,9 @@
#define SERIAL_DEV PNP_DEV(0x4e, IT8721F_SP1) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl)
{
}
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -45,13 +45,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
#define CLK_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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl)
{
}
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -46,11 +46,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1)
#define GPIO_DEV PNP_DEV(0x2e, IT8718F_GPIO) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -46,11 +46,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1)
#define GPIO_DEV PNP_DEV(0x2e, IT8718F_GPIO) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -46,11 +46,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1)
#define GPIO_DEV PNP_DEV(0x2e, IT8718F_GPIO) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -52,11 +52,10 @@
#define SERIAL_DEV PNP_DEV(0x2e, PILOT_SP1) #define SERIAL_DEV PNP_DEV(0x2e, PILOT_SP1)
#define RTC_DEV PNP_DEV(0x4e, PC87417_RTC) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; 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; u8 val;
outb(0x3d, 0x0cd6); outb(0x3d, 0x0cd6);

View File

@ -45,11 +45,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, F71859_SP1) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -50,11 +50,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, F71863FG_SP1) #define SERIAL_DEV PNP_DEV(0x2e, F71863FG_SP1)
#endif #endif
void activate_spd_rom(const struct mem_controller *ctrl);
int spd_read_byte(unsigned int device, unsigned int address); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl) { }
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -44,11 +44,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, W83627EHG_SP1) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; 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) inline int spd_read_byte(unsigned int device, unsigned int address)
{ {

View File

@ -47,11 +47,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
#define SUPERIO_DEV PNP_DEV(0x2e, 0) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; 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) inline int spd_read_byte(unsigned int device, unsigned int address)
{ {

View File

@ -50,11 +50,10 @@
#define SMBUS_SWITCH1 0x70 #define SMBUS_SWITCH1 0x70
#define SMBUS_SWITCH2 0x72 #define SMBUS_SWITCH2 0x72
void activate_spd_rom(const struct mem_controller *ctrl);
int spd_read_byte(unsigned int device, unsigned int address); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; 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_SWITCH1, 5 & 0x0f);
smbus_send_byte(SMBUS_SWITCH2, (5 >> 4) & 0x0f); smbus_send_byte(SMBUS_SWITCH2, (5 >> 4) & 0x0f);

View File

@ -42,13 +42,9 @@
#include "cpu/amd/quadcore/quadcore.c" #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; extern struct sys_info sysinfo_car;
void activate_spd_rom(const struct mem_controller *ctrl)
{
}
int spd_read_byte(u32 device, u32 address) int spd_read_byte(u32 device, u32 address)
{ {

View File

@ -43,11 +43,9 @@
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #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); int spd_read_byte(unsigned int device, unsigned int address);
extern struct sys_info sysinfo_car; 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) inline int spd_read_byte(unsigned int device, unsigned int address)
{ {

View File

@ -24,6 +24,8 @@ struct sys_info;
struct DCTStatStruc; struct DCTStatStruc;
struct MCTStatStruc; struct MCTStatStruc;
void activate_spd_rom(const struct mem_controller *ctrl);
int mctRead_SPD(u32 smaddr, u32 reg); int mctRead_SPD(u32 smaddr, u32 reg);
void mctSMBhub_Init(u32 node); void mctSMBhub_Init(u32 node);
void mctGet_DIMMAddr(struct DCTStatStruc *pDCTstat, u32 node); void mctGet_DIMMAddr(struct DCTStatStruc *pDCTstat, u32 node);

View File

@ -32,9 +32,12 @@
struct sys_info sysinfo_car CAR_GLOBAL; struct sys_info sysinfo_car CAR_GLOBAL;
struct mem_controller; struct mem_controller;
extern void activate_spd_rom(const struct mem_controller *ctrl);
extern int spd_read_byte(unsigned int device, unsigned int address); 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) void fam15h_switch_dct(uint32_t dev, uint8_t dct)
{ {
uint32_t dword; uint32_t dword;