diff options
| author | Myles Watson <mylesgw@gmail.com> | 2010-04-15 05:19:29 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2010-04-15 05:19:29 +0000 |
| commit | 075fbe820127c454a6854b87c277a2ca30dee1c2 (patch) | |
| tree | abc89718ed34b04febd7d6beae8e57cd54f3f5b0 /src/cpu/amd | |
| parent | 07ef092ef228b4cc7c85f375c0390acc901b5181 (diff) | |
Remove a few more warnings from fam10.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5440 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd')
| -rw-r--r-- | src/cpu/amd/microcode/microcode.c | 9 | ||||
| -rw-r--r-- | src/cpu/amd/model_10xxx/init_cpus.c | 1 | ||||
| -rw-r--r-- | src/cpu/amd/model_10xxx/model_10xxx_init.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/model_10xxx/update_microcode.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c index 08f61c2a9a..7a6333b93f 100644 --- a/src/cpu/amd/microcode/microcode.c +++ b/src/cpu/amd/microcode/microcode.c @@ -17,15 +17,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __PRE_RAM__ - +#ifndef __ROMCC__ #include <stdint.h> #include <console/console.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/amd/microcode.h> -#include <cpu/x86/cache.h> +#endif +#ifndef __PRE_RAM__ +#include <cpu/cpu.h> +#include <cpu/x86/cache.h> #endif struct microcode { diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c index cce44d7869..3a86be296f 100644 --- a/src/cpu/amd/model_10xxx/init_cpus.c +++ b/src/cpu/amd/model_10xxx/init_cpus.c @@ -30,7 +30,6 @@ #define SET_FIDVID_CORE0_ONLY 0 #endif -void update_microcode(u32 cpu_deviceid); static void prep_fid_change(void); static void init_fidvid_stage2(u32 apicid, u32 nodeid); void cpuSetAMDMSR(void); diff --git a/src/cpu/amd/model_10xxx/model_10xxx_init.c b/src/cpu/amd/model_10xxx/model_10xxx_init.c index d0511a75ce..ef6d8e084b 100644 --- a/src/cpu/amd/model_10xxx/model_10xxx_init.c +++ b/src/cpu/amd/model_10xxx/model_10xxx_init.c @@ -37,8 +37,6 @@ #include <cpu/amd/multicore.h> #include <cpu/amd/model_10xxx_msr.h> -extern device_t get_node_pci(u32 nodeid, u32 fn); - #define MCI_STATUS 0x401 msr_t rdmsr_amd(u32 index) diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/model_10xxx/update_microcode.c index 85b1aa84bf..b6c2c22945 100644 --- a/src/cpu/amd/model_10xxx/update_microcode.c +++ b/src/cpu/amd/model_10xxx/update_microcode.c @@ -23,7 +23,9 @@ #include <device/device.h> #include <device/pci.h> #include <string.h> +#endif +#ifndef __ROMCC__ #include <cpu/amd/microcode.h> #endif |