On 06.06.2009 00:03, Myles Watson wrote:
> On Fri, Jun 5, 2009 at 3:54 PM, Carl-Daniel Hailfinger wrote:
>
>> Fix non-revF K8 ram init compilation which was broken in r4341.
>>
> I'd prefer to fix it by changing all printk_raminit -> printk_spew.
>
Done.
Signed-off-by: Carl-Daniel Hailfinger <[email protected]>
Index:
LinuxBIOSv2-k8_raminit_debugmessages_fix/src/northbridge/amd/amdk8/raminit.c
===================================================================
---
LinuxBIOSv2-k8_raminit_debugmessages_fix/src/northbridge/amd/amdk8/raminit.c
(Revision 4341)
+++
LinuxBIOSv2-k8_raminit_debugmessages_fix/src/northbridge/amd/amdk8/raminit.c
(Arbeitskopie)
@@ -855,12 +855,12 @@
/* Now set top of memory */
msr_t msr;
if (tom_k > (4*1024*1024)) {
- printk_raminit("Handling memory mapped above 4 GB\n");
- printk_raminit("Upper RAM end at 0x%08x kB\n", tom_k);
+ printk_spew("Handling memory mapped above 4 GB\n");
+ printk_spew("Upper RAM end at 0x%08x kB\n", tom_k);
msr.lo = (tom_k & 0x003fffff) << 10;
msr.hi = (tom_k & 0xffc00000) >> 22;
wrmsr(TOP_MEM2, msr);
- printk_raminit("Correcting memory amount mapped below 4 GB\n");
+ printk_spew("Correcting memory amount mapped below 4 GB\n");
}
/* Leave a 64M hole between TOP_MEM and TOP_MEM2
@@ -873,9 +873,9 @@
} else
#endif
tom_k = 0x3f0000;
- printk_raminit("Adjusting lower RAM end\n");
+ printk_spew("Adjusting lower RAM end\n");
}
- printk_raminit("Lower RAM end at 0x%08x kB\n", tom_k);
+ printk_spew("Lower RAM end at 0x%08x kB\n", tom_k);
msr.lo = (tom_k & 0x003fffff) << 10;
msr.hi = (tom_k & 0xffc00000) >> 22;
wrmsr(TOP_MEM, msr);
@@ -2106,7 +2106,7 @@
return;
hw_spd_err:
/* Unrecoverable error reading SPD data */
- print_err("SPD error - reset\n");
+ printk_err("SPD error - reset\n");
hard_reset();
return;
}
@@ -2172,7 +2172,7 @@
hole_startk = 4*1024*1024 - HW_MEM_HOLE_SIZEK;
- printk_raminit("Handling memory hole at 0x%08x (default)\n",
hole_startk);
+ printk_spew("Handling memory hole at 0x%08x (default)\n", hole_startk);
#if HW_MEM_HOLE_SIZE_AUTO_INC == 1
/* We need to double check if hole_startk is valid.
* If it is equal to the dram base address in K (base_k),
@@ -2197,7 +2197,7 @@
basek_pri = base_k;
}
- printk_raminit("Handling memory hole at 0x%08x (adjusted)\n",
hole_startk);
+ printk_spew("Handling memory hole at 0x%08x (adjusted)\n", hole_startk);
#endif
/* Find node number that needs the memory hole configured */
for (i=0; i<controllers; i++) {
--
http://www.hailfinger.org/
Index:
LinuxBIOSv2-k8_raminit_debugmessages_fix/src/northbridge/amd/amdk8/raminit.c
===================================================================
---
LinuxBIOSv2-k8_raminit_debugmessages_fix/src/northbridge/amd/amdk8/raminit.c
(Revision 4341)
+++
LinuxBIOSv2-k8_raminit_debugmessages_fix/src/northbridge/amd/amdk8/raminit.c
(Arbeitskopie)
@@ -855,12 +855,12 @@
/* Now set top of memory */
msr_t msr;
if (tom_k > (4*1024*1024)) {
- printk_raminit("Handling memory mapped above 4 GB\n");
- printk_raminit("Upper RAM end at 0x%08x kB\n", tom_k);
+ printk_spew("Handling memory mapped above 4 GB\n");
+ printk_spew("Upper RAM end at 0x%08x kB\n", tom_k);
msr.lo = (tom_k & 0x003fffff) << 10;
msr.hi = (tom_k & 0xffc00000) >> 22;
wrmsr(TOP_MEM2, msr);
- printk_raminit("Correcting memory amount mapped below 4 GB\n");
+ printk_spew("Correcting memory amount mapped below 4 GB\n");
}
/* Leave a 64M hole between TOP_MEM and TOP_MEM2
@@ -873,9 +873,9 @@
} else
#endif
tom_k = 0x3f0000;
- printk_raminit("Adjusting lower RAM end\n");
+ printk_spew("Adjusting lower RAM end\n");
}
- printk_raminit("Lower RAM end at 0x%08x kB\n", tom_k);
+ printk_spew("Lower RAM end at 0x%08x kB\n", tom_k);
msr.lo = (tom_k & 0x003fffff) << 10;
msr.hi = (tom_k & 0xffc00000) >> 22;
wrmsr(TOP_MEM, msr);
@@ -2106,7 +2106,7 @@
return;
hw_spd_err:
/* Unrecoverable error reading SPD data */
- print_err("SPD error - reset\n");
+ printk_err("SPD error - reset\n");
hard_reset();
return;
}
@@ -2172,7 +2172,7 @@
hole_startk = 4*1024*1024 - HW_MEM_HOLE_SIZEK;
- printk_raminit("Handling memory hole at 0x%08x (default)\n",
hole_startk);
+ printk_spew("Handling memory hole at 0x%08x (default)\n", hole_startk);
#if HW_MEM_HOLE_SIZE_AUTO_INC == 1
/* We need to double check if hole_startk is valid.
* If it is equal to the dram base address in K (base_k),
@@ -2197,7 +2197,7 @@
basek_pri = base_k;
}
- printk_raminit("Handling memory hole at 0x%08x (adjusted)\n",
hole_startk);
+ printk_spew("Handling memory hole at 0x%08x (adjusted)\n", hole_startk);
#endif
/* Find node number that needs the memory hole configured */
for (i=0; i<controllers; i++) {
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
