[coreboot-gerrit] New patch to review for coreboot: 4ed5cd2 H8QGI / H8SCM / Dinar: Eliminate compiler warnings from build
Bruce Griffith (Bruce.Griffith@se-eng.com)
gerrit at coreboot.org
Tue Jun 25 08:10:25 CEST 2013
Bruce Griffith (Bruce.Griffith at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3527
-gerrit
commit 4ed5cd2710cc48ff003ef54ef793b150d1f97e0b
Author: Bruce Griffith <Bruce.Griffith at se-eng.com>
Date: Mon Jun 24 23:47:29 2013 -0600
H8QGI / H8SCM / Dinar: Eliminate compiler warnings from build
Fix a bunch of compiler-generated warning messages. These fixes are
mainly copied into AMD Family 15 server boards from similar code
in AMD Family 15tn (Trinity) boards.
Change-Id: Ic97e906c26c3b91eccd435413908a654294e50b6
Signed-off-by: Bruce Griffith <Bruce.Griffith at se-eng.com>
---
src/mainboard/amd/dinar/sb700_cfg.c | 5 ++++-
src/mainboard/amd/dinar/sb700_cfg.h | 6 +++++-
src/mainboard/supermicro/h8qgi/get_bus_conf.c | 1 +
src/mainboard/supermicro/h8qgi/mptable.c | 4 +++-
src/mainboard/supermicro/h8qgi/sb700_cfg.c | 5 ++++-
src/mainboard/supermicro/h8qgi/sb700_cfg.h | 6 +++++-
src/mainboard/supermicro/h8scm/agesawrapper.c | 12 +++++++++---
src/mainboard/supermicro/h8scm/get_bus_conf.c | 1 +
src/mainboard/supermicro/h8scm/mptable.c | 4 +++-
src/mainboard/supermicro/h8scm/sb700_cfg.c | 5 ++++-
src/mainboard/supermicro/h8scm/sb700_cfg.h | 6 +++++-
11 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/src/mainboard/amd/dinar/sb700_cfg.c b/src/mainboard/amd/dinar/sb700_cfg.c
index 94e4b40..c9a0949 100644
--- a/src/mainboard/amd/dinar/sb700_cfg.c
+++ b/src/mainboard/amd/dinar/sb700_cfg.c
@@ -126,7 +126,10 @@ void sb700_cimx_config(AMDSBCFG *sb_config)
/* Azalia HDA */
sb_config->AzaliaController = AZALIA_CONTROLLER;
sb_config->AzaliaPinCfg = AZALIA_PIN_CONFIG;
- sb_config->AzaliaSdin0 = AZALIA_SDIN_PIN;
+ sb_config->AzaliaSdin0 = AZALIA_SDIN_PIN_0;
+ sb_config->AzaliaSdin1 = AZALIA_SDIN_PIN_1;
+ sb_config->AzaliaSdin2 = AZALIA_SDIN_PIN_2;
+ sb_config->AzaliaSdin3 = AZALIA_SDIN_PIN_3;
sb_config->pAzaliaOemCodecTablePtr = NULL;
#ifndef __PRE_RAM__
diff --git a/src/mainboard/amd/dinar/sb700_cfg.h b/src/mainboard/amd/dinar/sb700_cfg.h
index 371c7ce..32ac4bd 100644
--- a/src/mainboard/amd/dinar/sb700_cfg.h
+++ b/src/mainboard/amd/dinar/sb700_cfg.h
@@ -192,7 +192,11 @@
*/
#ifndef AZALIA_SDIN_PIN
//#define AZALIA_SDIN_PIN 0xAA
-#define AZALIA_SDIN_PIN 0x2A
+#define AZALIA_SDIN_PIN
+#define AZALIA_SDIN_PIN_0 0x2
+#define AZALIA_SDIN_PIN_1 0x2
+#define AZALIA_SDIN_PIN_2 0x2
+#define AZALIA_SDIN_PIN_3 0x0
#endif
/**
diff --git a/src/mainboard/supermicro/h8qgi/get_bus_conf.c b/src/mainboard/supermicro/h8qgi/get_bus_conf.c
index 7682eec..079cafbd 100644
--- a/src/mainboard/supermicro/h8qgi/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qgi/get_bus_conf.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
+#include <cpu/amd/amdfam15.h>
#include "agesawrapper.h"
#if CONFIG_AMD_SB_CIMX
#include <sb_cimx.h>
diff --git a/src/mainboard/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index 2c112ce..c23b523 100644
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -49,7 +49,9 @@ static void *smp_write_config_table(void *v)
smp_write_processors(mc);
get_bus_conf();
- mptable_write_buses(mc, NULL, &bus_isa);
+ dword = bus_isa;
+ mptable_write_buses(mc, NULL, (int*)&dword);
+ bus_isa = dword;
/*
* AGESA v5 Apply apic enumeration rules
diff --git a/src/mainboard/supermicro/h8qgi/sb700_cfg.c b/src/mainboard/supermicro/h8qgi/sb700_cfg.c
index 54c139a..ff2334f 100644
--- a/src/mainboard/supermicro/h8qgi/sb700_cfg.c
+++ b/src/mainboard/supermicro/h8qgi/sb700_cfg.c
@@ -126,7 +126,10 @@ void sb700_cimx_config(AMDSBCFG *sb_config)
/* Azalia HDA */
sb_config->AzaliaController = AZALIA_CONTROLLER;
sb_config->AzaliaPinCfg = AZALIA_PIN_CONFIG;
- sb_config->AzaliaSdin0 = AZALIA_SDIN_PIN;
+ sb_config->AzaliaSdin0 = AZALIA_SDIN_PIN_0;
+ sb_config->AzaliaSdin1 = AZALIA_SDIN_PIN_1;
+ sb_config->AzaliaSdin2 = AZALIA_SDIN_PIN_2;
+ sb_config->AzaliaSdin3 = AZALIA_SDIN_PIN_3;
sb_config->pAzaliaOemCodecTablePtr = NULL;
#ifndef __PRE_RAM__
diff --git a/src/mainboard/supermicro/h8qgi/sb700_cfg.h b/src/mainboard/supermicro/h8qgi/sb700_cfg.h
index a3e5a38..4a51ecd 100644
--- a/src/mainboard/supermicro/h8qgi/sb700_cfg.h
+++ b/src/mainboard/supermicro/h8qgi/sb700_cfg.h
@@ -192,7 +192,11 @@
*/
#ifndef AZALIA_SDIN_PIN
//#define AZALIA_SDIN_PIN 0xAA
-#define AZALIA_SDIN_PIN 0x2A
+#define AZALIA_SDIN_PIN
+#define AZALIA_SDIN_PIN_0 0x2
+#define AZALIA_SDIN_PIN_1 0x2
+#define AZALIA_SDIN_PIN_2 0x2
+#define AZALIA_SDIN_PIN_3 0x0
#endif
/**
diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.c b/src/mainboard/supermicro/h8scm/agesawrapper.c
index 729b669..27e5f46 100644
--- a/src/mainboard/supermicro/h8scm/agesawrapper.c
+++ b/src/mainboard/supermicro/h8scm/agesawrapper.c
@@ -736,9 +736,9 @@ static void agesa_warning(EVENT_PARAMS *event)
case HT_EVENT_OPT_REQUIRED_CAP_RETRY:
printk(BIOS_DEBUG, "HT_EVENT_OPT_REQUIRED_CAP_RETRY, Socket %x Link %x Depth %x\n",
- event->DataParam1,
- event->DataParam2,
- event->DataParam3);
+ (unsigned int)event->DataParam1,
+ (unsigned int)event->DataParam2,
+ (unsigned int)event->DataParam3);
break;
case HT_EVENT_OPT_REQUIRED_CAP_GEN3:
@@ -763,6 +763,8 @@ static void agesa_warning(EVENT_PARAMS *event)
(unsigned int)event->DataParam2,
(unsigned int)event->DataParam3,
(unsigned int)event->DataParam4);
+ break;
+
default:
break;
}
@@ -984,6 +986,8 @@ static void agesa_error(EVENT_PARAMS *event)
(unsigned int)event->DataParam2,
(unsigned int)event->DataParam3,
(unsigned int)event->DataParam4);
+ break;
+
default:
break;
}
@@ -1022,6 +1026,8 @@ static void agesa_critical(EVENT_PARAMS *event)
(unsigned int)event->DataParam2,
(unsigned int)event->DataParam3,
(unsigned int)event->DataParam4);
+ break;
+
default:
break;
}
diff --git a/src/mainboard/supermicro/h8scm/get_bus_conf.c b/src/mainboard/supermicro/h8scm/get_bus_conf.c
index 3dc8471..b529b16 100644
--- a/src/mainboard/supermicro/h8scm/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm/get_bus_conf.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
+#include <cpu/amd/amdfam15.h>
#include "agesawrapper.h"
#if CONFIG_AMD_SB_CIMX
#include <sb_cimx.h>
diff --git a/src/mainboard/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c
index 2c112ce..c23b523 100644
--- a/src/mainboard/supermicro/h8scm/mptable.c
+++ b/src/mainboard/supermicro/h8scm/mptable.c
@@ -49,7 +49,9 @@ static void *smp_write_config_table(void *v)
smp_write_processors(mc);
get_bus_conf();
- mptable_write_buses(mc, NULL, &bus_isa);
+ dword = bus_isa;
+ mptable_write_buses(mc, NULL, (int*)&dword);
+ bus_isa = dword;
/*
* AGESA v5 Apply apic enumeration rules
diff --git a/src/mainboard/supermicro/h8scm/sb700_cfg.c b/src/mainboard/supermicro/h8scm/sb700_cfg.c
index 12169e6..c03a501 100644
--- a/src/mainboard/supermicro/h8scm/sb700_cfg.c
+++ b/src/mainboard/supermicro/h8scm/sb700_cfg.c
@@ -126,7 +126,10 @@ void sb700_cimx_config(AMDSBCFG *sb_config)
/* Azalia HDA */
sb_config->AzaliaController = AZALIA_CONTROLLER;
sb_config->AzaliaPinCfg = AZALIA_PIN_CONFIG;
- sb_config->AzaliaSdin0 = AZALIA_SDIN_PIN;
+ sb_config->AzaliaSdin0 = AZALIA_SDIN_PIN_0;
+ sb_config->AzaliaSdin1 = AZALIA_SDIN_PIN_1;
+ sb_config->AzaliaSdin2 = AZALIA_SDIN_PIN_2;
+ sb_config->AzaliaSdin3 = AZALIA_SDIN_PIN_3;
sb_config->pAzaliaOemCodecTablePtr = NULL;
#ifndef __PRE_RAM__
diff --git a/src/mainboard/supermicro/h8scm/sb700_cfg.h b/src/mainboard/supermicro/h8scm/sb700_cfg.h
index eca355f..11d48c2 100644
--- a/src/mainboard/supermicro/h8scm/sb700_cfg.h
+++ b/src/mainboard/supermicro/h8scm/sb700_cfg.h
@@ -192,7 +192,11 @@
*/
#ifndef AZALIA_SDIN_PIN
//#define AZALIA_SDIN_PIN 0xAA
-#define AZALIA_SDIN_PIN 0x2A
+#define AZALIA_SDIN_PIN
+#define AZALIA_SDIN_PIN_0 0x2
+#define AZALIA_SDIN_PIN_1 0x2
+#define AZALIA_SDIN_PIN_2 0x2
+#define AZALIA_SDIN_PIN_3 0x0
#endif
/**
More information about the coreboot-gerrit
mailing list