[coreboot] Patch set updated: a91c5a4 Miscellaneous AMD F14 warning fixes
Frank Vibrans III (frank.vibrans@amd.com)
gerrit at coreboot.org
Wed Aug 17 23:50:27 CEST 2011
Frank Vibrans III (frank.vibrans at amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/133
-gerrit
commit a91c5a433c5a32bcab8610b4722311991ab286d0
Author: efdesign98 <efdesign98 at gmail.com>
Date: Thu Aug 4 16:18:16 2011 -0600
Miscellaneous AMD F14 warning fixes
This commit adds in some more fixes to AMD F14 compile
warnings. The change in the mtrr.c file is in prep-
aration for changes yet to com, but it is currently
innocuous.
Change-Id: I6b204fe0af16a97d982f46f0dfeaccc4b8eb883e
Signed-off-by: Frank Vibrans <frank.vibrans at amd.com>
Signed-off-by: efdesign98 <efdesign98 at gmail.com>
---
src/include/cpu/amd/amdfam14.h | 2 ++
src/include/cpu/amd/mtrr.h | 8 ++++++--
src/include/pc80/i8254.h | 2 ++
src/pc80/i8254.c | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/include/cpu/amd/amdfam14.h b/src/include/cpu/amd/amdfam14.h
index c4b7e6d..a732219 100644
--- a/src/include/cpu/amd/amdfam14.h
+++ b/src/include/cpu/amd/amdfam14.h
@@ -42,5 +42,7 @@ void wait_all_other_cores_started(u32 bsp_apicid);
void wait_all_aps_started(u32 bsp_apicid);
void allow_all_aps_stop(u32 bsp_apicid);
#endif
+void get_bus_conf(void);
+u32 get_initial_apicid(void);
#endif /* CPU_AMD_FAM14_H */
diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h
index c0d6b51..3637dd9 100644
--- a/src/include/cpu/amd/mtrr.h
+++ b/src/include/cpu/amd/mtrr.h
@@ -27,8 +27,12 @@
#define TOP_MEM_MSR 0xC001001A
#define TOP_MEM2_MSR 0xC001001D
-#define TOP_MEM TOP_MEM_MSR
-#define TOP_MEM2 TOP_MEM2_MSR
+#ifndef TOP_MEM
+ #define TOP_MEM TOP_MEM_MSR
+#endif
+#ifndef TOP_MEM2
+ #define TOP_MEM2 TOP_MEM2_MSR
+#endif
#define TOP_MEM_MASK 0x007fffff
#define TOP_MEM_MASK_KB (TOP_MEM_MASK >> 10)
diff --git a/src/include/pc80/i8254.h b/src/include/pc80/i8254.h
index b0d3a93..82f31e6 100644
--- a/src/include/pc80/i8254.h
+++ b/src/include/pc80/i8254.h
@@ -20,6 +20,8 @@
#ifndef PC80_I8254_H
#define PC80_I8254_H
+void setup_i8254(void);
+
/* Ports for the 8254 timer chip */
#define TIMER0_PORT 0x40
#define TIMER1_PORT 0x41
diff --git a/src/pc80/i8254.c b/src/pc80/i8254.c
index ca993f4..e5dc40b 100644
--- a/src/pc80/i8254.c
+++ b/src/pc80/i8254.c
@@ -35,7 +35,7 @@ void setup_i8254(void)
outb(0x12, TIMER1_PORT);
}
-#if CONFIG_UDELAY_TIMER2
+#ifdef CONFIG_UDELAY_TIMER2
static void load_timer2(unsigned int ticks)
{
/* Set up the timer gate, turn off the speaker */
More information about the coreboot
mailing list