GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a bunch of cast and type warnings and don't call the apic "nvram", that 

doesn't make no sense. (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@3977 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-03-06 17:24:29 +00:00 committed by Stefan Reinauer
parent 054c7235c3
commit 8dcd50b155
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/i386/boot/acpi.c
View File

@ -202,7 +202,7 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, char *oem_table_id)
ssdt->asl_compiler_revision = 42; ssdt->asl_compiler_revision = 42;
ssdt->length = sizeof(acpi_header_t); ssdt->length = sizeof(acpi_header_t);
acpigen_set_current((unsigned char *) current); acpigen_set_current((char *) current);
current = acpi_fill_ssdt_generator(current, oem_table_id); current = acpi_fill_ssdt_generator(current, oem_table_id);
/* recalculate length */ /* recalculate length */

8
src/arch/i386/boot/multiboot.c
View File

@ -72,7 +72,7 @@ static void build_mb_mem_range(void *gp, struct device *dev, struct resource *re
build_mb_mem_range_nooverlap(res->base, res->size); build_mb_mem_range_nooverlap(res->base, res->size);
} }
#define ROUND(_r,_a) ((_r) + (((_a) - 1)) & ~((_a) - 1)) #define ROUND(_r,_a) (((_r) + (((_a) - 1))) & ~((_a) - 1))
unsigned long write_multiboot_info( unsigned long write_multiboot_info(
unsigned long low_table_start, unsigned long low_table_end, unsigned long low_table_start, unsigned long low_table_end,
@ -81,12 +81,12 @@ unsigned long write_multiboot_info(
struct multiboot_info *mbi; struct multiboot_info *mbi;
int i; int i;
mbi = rom_table_end; mbi = (struct multiboot_info *)rom_table_end;
memset(mbi, 0, sizeof(*mbi)); memset(mbi, 0, sizeof(*mbi));
rom_table_end += sizeof(*mbi); rom_table_end += sizeof(*mbi);
mbi->mmap_addr = (u32) rom_table_end; mbi->mmap_addr = (u32) rom_table_end;
mb_mem = rom_table_end; mb_mem = (struct multiboot_mmap_entry *)rom_table_end;
/* reserved regions */ /* reserved regions */
reserved_mem[0].addr = low_table_start; reserved_mem[0].addr = low_table_start;
@ -111,5 +111,5 @@ unsigned long write_multiboot_info(
printk_info("Multiboot Information structure has been written.\n"); printk_info("Multiboot Information structure has been written.\n");
return mb_mem; return (unsigned long)mb_mem;
} }

2
src/arch/i386/boot/tables.c
View File

@ -182,7 +182,7 @@ struct lb_memory *write_tables(void)
#if CONFIG_MULTIBOOT #if CONFIG_MULTIBOOT
/* The Multiboot information structure */ /* The Multiboot information structure */
mbi = rom_table_end; mbi = (struct multiboot_info *)rom_table_end;
rom_table_end = write_multiboot_info( rom_table_end = write_multiboot_info(
low_table_start, low_table_end, low_table_start, low_table_end,
rom_table_start, rom_table_end); rom_table_start, rom_table_end);

4
src/arch/i386/smp/ioapic.c
View File

@ -55,11 +55,11 @@ void setup_ioapic(void)
{ {
int i; int i;
unsigned long value_low, value_high; unsigned long value_low, value_high;
unsigned long nvram = 0xfec00000; unsigned long ioapicaddr = 0xfec00000;
volatile unsigned long *l; volatile unsigned long *l;
struct ioapicreg *a = ioapicregvalues; struct ioapicreg *a = ioapicregvalues;
l = (unsigned long *) nvram; l = (unsigned long *) ioapicaddr;
#if defined(i786) #if defined(i786)
/* For the pentium 4 and above apic deliver their interrupts /* For the pentium 4 and above apic deliver their interrupts
* on the front side bus, enable that. * on the front side bus, enable that.

2
src/cpu/x86/lapic/lapic_cpu_init.c
View File

@ -295,7 +295,7 @@ void stop_this_cpu(void)
lapicid = lapic_read(LAPIC_ID) >> 24; lapicid = lapic_read(LAPIC_ID) >> 24;
printk_debug("CPU %d going down...\n", lapicid); printk_debug("CPU %ld going down...\n", lapicid);
/* send an LAPIC INIT to myself */ /* send an LAPIC INIT to myself */
lapic_write_around(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(lapicid)); lapic_write_around(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(lapicid));

9
src/cpu/x86/tsc/delay_tsc.c
View File

@ -104,6 +104,7 @@ static unsigned long long calibrate_tsc(void)
unsigned long long start, end, delta; unsigned long long start, end, delta;
unsigned long result, count; unsigned long result, count;
printk_spew("Calibrating delay loop...\n");
start = rdtscll(); start = rdtscll();
// no udivdi3, dammit. // no udivdi3, dammit.
// so we count to 1<< 20 and then right shift 20 // so we count to 1<< 20 and then right shift 20
@ -127,10 +128,10 @@ static unsigned long long calibrate_tsc(void)
delta >>= 20; delta >>= 20;
// save this for microsecond timing. // save this for microsecond timing.
result = delta; result = delta;
printk_spew("end %x, start %x\n", end, start); printk_spew("end %llx, start %llx\n", end, start);
printk_spew("32-bit delta %d\n", (unsigned long) delta); printk_spew("32-bit delta %ld\n", (unsigned long) delta);
printk_spew("%s 32-bit result is %d\n", printk_spew("%s 32-bit result is %ld\n",
__func__, __func__,
result); result);
return delta; return delta;
@ -143,7 +144,7 @@ void init_timer(void)
{ {
if (!clocks_per_usec) { if (!clocks_per_usec) {
clocks_per_usec = calibrate_tsc(); clocks_per_usec = calibrate_tsc();
printk_info("clocks_per_usec: %u\n", clocks_per_usec); printk_info("clocks_per_usec: %lu\n", clocks_per_usec);
} }
} }

3
src/devices/device.c
View File

@ -357,8 +357,7 @@ void compute_allocate_resource(
resource->flags &= ~IORESOURCE_STORED; resource->flags &= ~IORESOURCE_STORED;
base += size; base += size;
printk_spew( printk_spew("%s %02lx * [0x%08Lx - 0x%08Lx] %s\n",
"%s %02lx * [0x%08Lx - 0x%08Lx] %s\n",
dev_path(dev), dev_path(dev),
resource->index, resource->index,
resource->base, resource->base,