diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2007-10-23 22:17:45 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2007-10-23 22:17:45 +0000 |
| commit | 0dff6e3fa95ea13f6ee6cb2d4277e83076d81bad (patch) | |
| tree | aaf9a4fcab39c9dba0c4dc7457a79fc0d327cf4c /src/devices | |
| parent | 643eee07541f10fcc3b34a56dc8bf2cf8d93c649 (diff) | |
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
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/device_util.c | 2 | ||||
| -rw-r--r-- | src/devices/hypertransport.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/devices/device_util.c b/src/devices/device_util.c index efb1f0f257..c6ef541282 100644 --- a/src/devices/device_util.c +++ b/src/devices/device_util.c @@ -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); diff --git a/src/devices/hypertransport.c b/src/devices/hypertransport.c index 9846794edd..01096d054e 100644 --- a/src/devices/hypertransport.c +++ b/src/devices/hypertransport.c @@ -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) { |