Author: stepan
Date: 2007-08-19 01:31:09 +0200 (Sun, 19 Aug 2007)
New Revision: 467
Modified:
LinuxBIOSv3/arch/x86/geodelx/geodelx.c
LinuxBIOSv3/mainboard/adl/msm800sev/initram.c
LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c
LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c
LinuxBIOSv3/mainboard/emulation/qemu-x86/stage1.c
LinuxBIOSv3/northbridge/amd/geodelx/geodelx.c
LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c
Log:
small trivial patch to fix return types, printk warnings
Signed-off-by: Stefan Reinauer <[EMAIL PROTECTED]>
Acked-by: Stefan Reinauer <[EMAIL PROTECTED]>
Modified: LinuxBIOSv3/arch/x86/geodelx/geodelx.c
===================================================================
--- LinuxBIOSv3/arch/x86/geodelx/geodelx.c 2007-08-11 18:38:24 UTC (rev
466)
+++ LinuxBIOSv3/arch/x86/geodelx/geodelx.c 2007-08-18 23:31:09 UTC (rev
467)
@@ -152,9 +152,8 @@
msr_glcp_sys_pll = rdmsr(GLCP_SYS_RSTPLL);
- printk(BIOS_DEBUG,
- "_MSR GLCP_SYS_RSTPLL (%08x) value is: %08x:%08x\n",
- msr_glcp_sys_pll.hi, msr_glcp_sys_pll.lo);
+ printk(BIOS_DEBUG, "_MSR GLCP_SYS_RSTPLL (%08x) value is: %08x:%08x\n",
+ GLCP_SYS_RSTPLL, msr_glcp_sys_pll.hi, msr_glcp_sys_pll.lo);
post_code(POST_PLL_INIT);
if (!(msr_glcp_sys_pll.lo & (1 << RSTPLL_LOWER_SWFLAGS_SHIFT))) {
Modified: LinuxBIOSv3/mainboard/adl/msm800sev/initram.c
===================================================================
--- LinuxBIOSv3/mainboard/adl/msm800sev/initram.c 2007-08-11 18:38:24 UTC
(rev 466)
+++ LinuxBIOSv3/mainboard/adl/msm800sev/initram.c 2007-08-18 23:31:09 UTC
(rev 467)
@@ -59,4 +59,6 @@
printk(BIOS_SPEW, "Before wbinvd\n");
__asm__("wbinvd\n");
printk(BIOS_SPEW, "After wbinvd\n");
+
+ return 0;
}
Modified: LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c
===================================================================
--- LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c 2007-08-11 18:38:24 UTC
(rev 466)
+++ LinuxBIOSv3/mainboard/adl/msm800sev/stage1.c 2007-08-18 23:31:09 UTC
(rev 467)
@@ -35,7 +35,7 @@
#define SERIAL_DEV 0x30
-int hardware_stage1(void)
+void hardware_stage1(void)
{
void w83627hf_enable_serial(u8 dev, u8 serial, u16 iobase);
post_code(POST_START_OF_MAIN);
Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c
===================================================================
--- LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c 2007-08-11 18:38:24 UTC
(rev 466)
+++ LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c 2007-08-18 23:31:09 UTC
(rev 467)
@@ -48,7 +48,7 @@
wrmsr(dbe61_msr[i].reg, dbe61_msr[i].msr);
}
-int hardware_stage1(void)
+void hardware_stage1(void)
{
post_code(POST_START_OF_MAIN);
Modified: LinuxBIOSv3/mainboard/emulation/qemu-x86/stage1.c
===================================================================
--- LinuxBIOSv3/mainboard/emulation/qemu-x86/stage1.c 2007-08-11 18:38:24 UTC
(rev 466)
+++ LinuxBIOSv3/mainboard/emulation/qemu-x86/stage1.c 2007-08-18 23:31:09 UTC
(rev 467)
@@ -18,11 +18,13 @@
*/
/* no printk allowed until hardware is ready; hardware is ready */
+
/**
* start up hardware needed for stage1
*/
void hardware_stage1(void)
{
+ /* Nothing to do for Qemu */
}
void disable_car(void)
{
Modified: LinuxBIOSv3/northbridge/amd/geodelx/geodelx.c
===================================================================
--- LinuxBIOSv3/northbridge/amd/geodelx/geodelx.c 2007-08-11 18:38:24 UTC
(rev 466)
+++ LinuxBIOSv3/northbridge/amd/geodelx/geodelx.c 2007-08-18 23:31:09 UTC
(rev 467)
@@ -248,9 +248,7 @@
for (link = 0; link < dev->links; link++) {
bus = &dev->link[link];
if (bus->children) {
- printk(BIOS_DEBUG,
- "my_dev_set_resources: phase4_assign_resources
%d\n",
- bus);
+ printk(BIOS_DEBUG, "my_dev_set_resources:
phase4_assign_resources %p\n", bus);
phase4_assign_resources(bus);
}
}
Modified: LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c
===================================================================
--- LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c 2007-08-11 18:38:24 UTC
(rev 466)
+++ LinuxBIOSv3/northbridge/amd/geodelx/geodelxinit.c 2007-08-18 23:31:09 UTC
(rev 467)
@@ -123,7 +123,7 @@
msr.lo = gl->lo;
msr.hi = gl->hi;
wrmsr(gl->desc_name, msr);
- printk(BIOS_SPEW, "%s: MSR 0x%08x, val 0x%08x:0x%08x\n",
+ printk(BIOS_SPEW, "%s: MSR 0x%08lx, val 0x%08x:0x%08x\n",
__FUNCTION__, gl->desc_name, msr.hi, msr.lo);
}
@@ -175,7 +175,7 @@
msr.lo = sizebytes;
wrmsr(gl->desc_name, msr);
- printk(BIOS_DEBUG, "%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__,
+ printk(BIOS_DEBUG, "%s: MSR 0x%08lx, val 0x%08x:0x%08x\n", __FUNCTION__,
gl->desc_name, msr.hi, msr.lo);
}
@@ -206,7 +206,7 @@
msr.lo |= ((~(SMM_SIZE * 1024) + 1) >> 12) & 0xfffff;
wrmsr(gl->desc_name, msr);
- printk(BIOS_DEBUG, "%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__,
+ printk(BIOS_DEBUG, "%s: MSR 0x%08lx, val 0x%08x:0x%08x\n", __FUNCTION__,
gl->desc_name, msr.hi, msr.lo);
}
@@ -228,7 +228,7 @@
msr.lo |= ((~(SMM_SIZE * 1024) + 1) >> 12) & 0xfffff;
wrmsr(gl->desc_name, msr);
- printk(BIOS_DEBUG, "%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__,
+ printk(BIOS_DEBUG, "%s: MSR 0x%08lx, val 0x%08x:0x%08x\n", __FUNCTION__,
gl->desc_name, msr.hi, msr.lo);
}
--
linuxbios mailing list
[email protected]
http://www.linuxbios.org/mailman/listinfo/linuxbios
