diff --git a/arch/x86/geodelx/geodelx.c b/arch/x86/geodelx/geodelx.c index bd52e6b0d9..3b210a5bc8 100644 --- a/arch/x86/geodelx/geodelx.c +++ b/arch/x86/geodelx/geodelx.c @@ -152,9 +152,8 @@ void pll_reset(int manualconf, u32 pll_hi, u32 pll_lo) 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))) { diff --git a/mainboard/adl/msm800sev/initram.c b/mainboard/adl/msm800sev/initram.c index 2657ea3da2..a9c1ac6b23 100644 --- a/mainboard/adl/msm800sev/initram.c +++ b/mainboard/adl/msm800sev/initram.c @@ -59,4 +59,6 @@ int main(void) printk(BIOS_SPEW, "Before wbinvd\n"); __asm__("wbinvd\n"); printk(BIOS_SPEW, "After wbinvd\n"); + + return 0; } diff --git a/mainboard/adl/msm800sev/stage1.c b/mainboard/adl/msm800sev/stage1.c index 102a84a25c..1689341412 100644 --- a/mainboard/adl/msm800sev/stage1.c +++ b/mainboard/adl/msm800sev/stage1.c @@ -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); diff --git a/mainboard/artecgroup/dbe61/stage1.c b/mainboard/artecgroup/dbe61/stage1.c index c97de93990..e941f3aa15 100644 --- a/mainboard/artecgroup/dbe61/stage1.c +++ b/mainboard/artecgroup/dbe61/stage1.c @@ -48,7 +48,7 @@ static void dbe61_msr_init(void) wrmsr(dbe61_msr[i].reg, dbe61_msr[i].msr); } -int hardware_stage1(void) +void hardware_stage1(void) { post_code(POST_START_OF_MAIN); diff --git a/mainboard/emulation/qemu-x86/stage1.c b/mainboard/emulation/qemu-x86/stage1.c index c83cca4e38..036a800c61 100644 --- a/mainboard/emulation/qemu-x86/stage1.c +++ b/mainboard/emulation/qemu-x86/stage1.c @@ -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) { diff --git a/northbridge/amd/geodelx/geodelx.c b/northbridge/amd/geodelx/geodelx.c index 402c8904eb..f22f29aab9 100644 --- a/northbridge/amd/geodelx/geodelx.c +++ b/northbridge/amd/geodelx/geodelx.c @@ -248,9 +248,7 @@ static void geodelx_northbridge_set_resources(struct device *dev) 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); } } diff --git a/northbridge/amd/geodelx/geodelxinit.c b/northbridge/amd/geodelx/geodelxinit.c index 41e64c1b43..024baf24ff 100644 --- a/northbridge/amd/geodelx/geodelxinit.c +++ b/northbridge/amd/geodelx/geodelxinit.c @@ -123,7 +123,7 @@ static void writeglmsr(struct gliutable *gl) 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 @@ static void sysmem_init(struct gliutable *gl) 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 @@ static void SMMGL0Init(struct gliutable *gl) 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 @@ static void SMMGL1Init(struct gliutable *gl) 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); }