printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / mainboard / digitallogic / msm586seg / mainboard.c

diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index 8e537958ae708977cfbb690be24d93bf4917ef9b..cfc1a21ca3d7204f04a48a4a8e08b6ff5629e937 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -23,10 +23,10 @@ static void irqdump()
                -1};
   mmcr = (void *) 0xfffef000;
 
-  printk_err("mmcr is %p\n", mmcr);
+  printk(BIOS_ERR, "mmcr is %p\n", mmcr);
   for(i = 0; irqlist[i] >= 0; i++) {
     irq = mmcr + irqlist[i];
-    printk_err("0x%x register @%p is 0x%lx\n", irqlist[i], irq, *irq);
+    printk(BIOS_ERR, "0x%x register @%p is 0x%lx\n", irqlist[i], irq, *irq);
   }
 
 }
@@ -35,7 +35,6 @@ static void irqdump()
    - set ADDDECTL (now done in raminit.c in cpu/amd/sc520
 */
 static void enable_dev(struct device *dev) {
-       extern unsigned char *rom_start, *rom_end;
        volatile struct mmcrpic *pic = MMCRPIC;
        volatile struct mmcr *mmcr = MMCRDEFAULT;
 
@@ -44,7 +43,7 @@ static void enable_dev(struct device *dev) {
         */
 
        /* currently, nothing in the device to use, so ignore it. */
-       printk_err("digital logic msm586 seg ENTER %s\n", __FUNCTION__);
+       printk(BIOS_ERR, "digital logic msm586 seg ENTER %s\n", __func__);
 
 
        /* from fuctory bios */
@@ -78,10 +77,10 @@ static void enable_dev(struct device *dev) {
 
 
        irqdump();
-       printk_err("uart 1 ctl is 0x%x\n", *(unsigned char *) 0xfffefcc0);
+       printk(BIOS_ERR, "uart 1 ctl is 0x%x\n", *(unsigned char *) 0xfffefcc0);
 
-       printk_err("0xc20 ctl is 0x%x\n", *(unsigned short *) 0xfffefc20);
-       printk_err("0xc22 0x%x\n", *(unsigned short *) 0xfffefc22b);
+       printk(BIOS_ERR, "0xc20 ctl is 0x%x\n", *(unsigned short *) 0xfffefc20);
+       printk(BIOS_ERR, "0xc22 0x%x\n", *(unsigned short *) 0xfffefc22b);
 
        /* The following block has NOT proven sufficient to get
         * the VGA hardware to talk to us 
@@ -93,7 +92,7 @@ static void enable_dev(struct device *dev) {
        mmcr->sysarb.prictl = 0xc0000f0f;
        /* this is bios setting, depends on sysarb above */
        mmcr->hostbridge.ctl = 0x108;
-       printk_err("digital logic msm586 seg EXIT %s\n", __FUNCTION__);
+       printk(BIOS_ERR, "digital logic msm586 seg EXIT %s\n", __func__);
 
        /* pio */
        mmcr->pio.data31_16 = 0xffbf;
@@ -133,15 +132,8 @@ static void enable_dev(struct device *dev) {
         */
        /* follow fuctory here */
        mmcr->dmacontrol.extchanmapa = 0x3210;
-
-       /* hack for IDIOTIC need to fix rom_start */
-       printk_err("Patching rom_start due to sc520 limits\n");
-       rom_start = 0x2000000 + 0x40000;
-       rom_end = rom_start + PAYLOAD_SIZE - 1;
-
-       
 }
-struct chip_operations mainboard_digitallogic_msm586seg_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("DIGITAL-LOGIC MSM586SEG Mainboard")
        .enable_dev = enable_dev
 };