fix a whole bunch of warnings. (trivial)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2890 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
643eee0754
commit
0dff6e3fa9
|
@ -120,7 +120,7 @@ void lb_strings(struct lb_header *header)
|
|||
{
|
||||
static const struct {
|
||||
uint32_t tag;
|
||||
const uint8_t *string;
|
||||
const char *string;
|
||||
} strings[] = {
|
||||
{ LB_TAG_VERSION, linuxbios_version, },
|
||||
{ LB_TAG_EXTRA_VERSION, linuxbios_extra_version, },
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <arch/pirq_routing.h>
|
||||
#include <arch/smp/mpspec.h>
|
||||
#include <arch/acpi.h>
|
||||
#include <string.h>
|
||||
#include "linuxbios_table.h"
|
||||
|
||||
// Global Descriptor Table, defined in c_start.S
|
||||
|
|
|
@ -144,7 +144,7 @@ static struct verify_callback *process_elf_notes(
|
|||
{
|
||||
struct verify_callback *cb_chain;
|
||||
unsigned char *note, *end;
|
||||
char *program, *version;
|
||||
unsigned char *program, *version;
|
||||
|
||||
cb_chain = 0;
|
||||
note = header + offset;
|
||||
|
|
|
@ -349,7 +349,6 @@ void x86_setup_fixed_mtrrs(void)
|
|||
* mtrrs. If this doesn't work out we can get smart again
|
||||
* and clear out the mtrrs.
|
||||
*/
|
||||
struct var_mtrr_state var_state;
|
||||
|
||||
printk_debug("\n");
|
||||
/* Initialized the fixed_mtrrs to uncached */
|
||||
|
|
|
@ -102,8 +102,7 @@ bad_ctc:
|
|||
static unsigned long long calibrate_tsc(void)
|
||||
{
|
||||
unsigned long long start, end, delta;
|
||||
unsigned long allones = (unsigned long) -1, result;
|
||||
unsigned long count;
|
||||
unsigned long result, count;
|
||||
|
||||
start = rdtscll();
|
||||
// no udivdi3, dammit.
|
||||
|
|
|
@ -454,7 +454,7 @@ const char *resource_type(struct resource *resource)
|
|||
void report_resource_stored(device_t dev, struct resource *resource, const char *comment)
|
||||
{
|
||||
if (resource->flags & IORESOURCE_STORED) {
|
||||
unsigned char buf[10];
|
||||
char buf[10];
|
||||
unsigned long long base, end;
|
||||
base = resource->base;
|
||||
end = resource_end(resource);
|
||||
|
|
|
@ -37,6 +37,9 @@
|
|||
#include <part/hard_reset.h>
|
||||
#include <part/fallback_boot.h>
|
||||
|
||||
/* The hypertransport link is already optimized in pre-ram code
|
||||
* so don't do it again
|
||||
*/
|
||||
#define OPT_HT_LINK 0
|
||||
|
||||
#if OPT_HT_LINK == 1
|
||||
|
@ -123,15 +126,17 @@ struct ht_link {
|
|||
|
||||
static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
|
||||
{
|
||||
#if OPT_HT_LINK == 1
|
||||
static const uint8_t link_width_to_pow2[]= { 3, 4, 0, 5, 1, 2, 0, 0 };
|
||||
static const uint8_t pow2_to_link_width[] = { 0x7, 4, 5, 0, 1, 3 };
|
||||
struct ht_link cur[1];
|
||||
unsigned present_width_cap, upstream_width_cap;
|
||||
unsigned present_freq_cap, upstream_freq_cap;
|
||||
unsigned ln_present_width_in, ln_upstream_width_in;
|
||||
unsigned ln_present_width_out, ln_upstream_width_out;
|
||||
unsigned freq, old_freq;
|
||||
unsigned present_width, upstream_width, old_width;
|
||||
#endif
|
||||
struct ht_link cur[1];
|
||||
int reset_needed;
|
||||
int linkb_to_host;
|
||||
|
||||
|
@ -485,7 +490,7 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
|
|||
next_unitid = HT_CHAIN_END_UNITID_BASE;
|
||||
end_used = 1;
|
||||
} else {
|
||||
goto out;
|
||||
goto end_of_chain;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -535,7 +540,6 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
|
|||
(dev->enabled? "enabled": "disabled"), next_unitid);
|
||||
|
||||
} while (last_unitid != next_unitid);
|
||||
out:
|
||||
end_of_chain:
|
||||
#if OPT_HT_LINK == 1
|
||||
if(bus->reset_needed) {
|
||||
|
|
Loading…
Reference in New Issue