diff options
Diffstat (limited to 'src/mainboard/kontron')
-rw-r--r-- | src/mainboard/kontron/986lcd-m/acpi_tables.c | 26 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/mainboard.c | 10 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/mainboard_smi.c | 2 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/mptable.c | 6 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/romstage.c | 18 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/rtl8168.c | 2 | ||||
-rw-r--r-- | src/mainboard/kontron/kt690/acpi_tables.c | 42 | ||||
-rw-r--r-- | src/mainboard/kontron/kt690/fadt.c | 2 | ||||
-rw-r--r-- | src/mainboard/kontron/kt690/irq_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/kontron/kt690/mainboard.c | 16 | ||||
-rw-r--r-- | src/mainboard/kontron/kt690/mptable.c | 2 | ||||
-rw-r--r-- | src/mainboard/kontron/kt690/romstage.c | 14 |
12 files changed, 72 insertions, 72 deletions
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c index a8e171d23d..afc4ad5fbe 100644 --- a/src/mainboard/kontron/986lcd-m/acpi_tables.c +++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c @@ -150,7 +150,7 @@ unsigned long write_acpi_tables(unsigned long start) /* Align ACPI tables to 16byte */ ALIGN_CURRENT; - printk_info("ACPI: Writing ACPI tables at %lx.\n", start); + printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start); /* We need at least an RSDP and an RSDT Table */ rsdp = (acpi_rsdp_t *) current; @@ -173,7 +173,7 @@ unsigned long write_acpi_tables(unsigned long start) /* * We explicitly add these tables later on: */ - printk_debug("ACPI: * HPET\n"); + printk(BIOS_DEBUG, "ACPI: * HPET\n"); hpet = (acpi_hpet_t *) current; current += sizeof(acpi_hpet_t); @@ -182,7 +182,7 @@ unsigned long write_acpi_tables(unsigned long start) acpi_add_table(rsdp, hpet); /* If we want to use HPET Timers Linux wants an MADT */ - printk_debug("ACPI: * MADT\n"); + printk(BIOS_DEBUG, "ACPI: * MADT\n"); madt = (acpi_madt_t *) current; acpi_create_madt(madt); @@ -190,14 +190,14 @@ unsigned long write_acpi_tables(unsigned long start) ALIGN_CURRENT; acpi_add_table(rsdp, madt); - printk_debug("ACPI: * MCFG\n"); + printk(BIOS_DEBUG, "ACPI: * MCFG\n"); mcfg = (acpi_mcfg_t *) current; acpi_create_mcfg(mcfg); current += mcfg->header.length; ALIGN_CURRENT; acpi_add_table(rsdp, mcfg); - printk_debug("ACPI: * FACS\n"); + printk(BIOS_DEBUG, "ACPI: * FACS\n"); facs = (acpi_facs_t *) current; current += sizeof(acpi_facs_t); ALIGN_CURRENT; @@ -213,7 +213,7 @@ unsigned long write_acpi_tables(unsigned long start) /* Pack GNVS into the ACPI table area */ for (i=0; i < dsdt->length; i++) { if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) { - printk_debug("ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08lx\n", i, current); + printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08lx\n", i, current); *(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes break; } @@ -232,18 +232,18 @@ unsigned long write_acpi_tables(unsigned long start) dsdt->checksum = 0; dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length); - printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt, + printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); #if CONFIG_HAVE_ACPI_SLIC - printk_debug("ACPI: * SLIC\n"); + printk(BIOS_DEBUG, "ACPI: * SLIC\n"); slic = (acpi_header_t *)current; current += acpi_create_slic(current); ALIGN_CURRENT; acpi_add_table(rsdp, slic); #endif - printk_debug("ACPI: * FADT\n"); + printk(BIOS_DEBUG, "ACPI: * FADT\n"); fadt = (acpi_fadt_t *) current; current += sizeof(acpi_fadt_t); ALIGN_CURRENT; @@ -251,16 +251,16 @@ unsigned long write_acpi_tables(unsigned long start) acpi_create_fadt(fadt, facs, dsdt); acpi_add_table(rsdp, fadt); - printk_debug("ACPI: * SSDT\n"); + printk(BIOS_DEBUG, "ACPI: * SSDT\n"); ssdt = (acpi_header_t *)current; acpi_create_ssdt_generator(ssdt, "COREBOOT"); current += ssdt->length; acpi_add_table(rsdp, ssdt); ALIGN_CURRENT; - printk_debug("current = %lx\n", current); + printk(BIOS_DEBUG, "current = %lx\n", current); - printk_debug("ACPI: * DMI (Linux workaround)\n"); + printk(BIOS_DEBUG, "ACPI: * DMI (Linux workaround)\n"); memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE); #if CONFIG_WRITE_HIGH_TABLES == 1 memcpy((void *)current, dmi_table, DMI_TABLE_SIZE); @@ -268,6 +268,6 @@ unsigned long write_acpi_tables(unsigned long start) ALIGN_CURRENT; #endif - printk_info("ACPI: done.\n"); + printk(BIOS_INFO, "ACPI: done.\n"); return current; } diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index 180df992e6..c7f2ee00e4 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -47,7 +47,7 @@ static int int15_handler(void) #define BOOT_DISPLAY_EFP2 (1 << 6) #define BOOT_DISPLAY_LCD2 (1 << 7) - printk_debug("%s: AX=%04x BX=%04x CX=%04x DX=%04x\n", + printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n", __func__, M.x86.R_AX, M.x86.R_BX, M.x86.R_CX, M.x86.R_DX); switch (M.x86.R_AX) { @@ -176,12 +176,12 @@ static void hwm_setup(void) switch (cpufan_control) { case FAN_CRUISE_CONTROL_SPEED: - printk_debug("Fan Cruise Control setting CPU fan to %d RPM\n", + printk(BIOS_DEBUG, "Fan Cruise Control setting CPU fan to %d RPM\n", fan_speeds[cpufan_speed].fan_speed); hwm_write(0x06, fan_speeds[cpufan_speed].fan_in); // CPUFANIN target speed break; case FAN_CRUISE_CONTROL_THERMAL: - printk_debug("Fan Cruise Control setting CPU fan to activation at %d deg C/%d deg F\n", + printk(BIOS_DEBUG, "Fan Cruise Control setting CPU fan to activation at %d deg C/%d deg F\n", temperatures[cpufan_temperature].deg_celsius, temperatures[cpufan_temperature].deg_fahrenheit); hwm_write(0x06, temperatures[cpufan_temperature].deg_celsius); // CPUFANIN target temperature @@ -190,12 +190,12 @@ static void hwm_setup(void) switch (sysfan_control) { case FAN_CRUISE_CONTROL_SPEED: - printk_debug("Fan Cruise Control setting system fan to %d RPM\n", + printk(BIOS_DEBUG, "Fan Cruise Control setting system fan to %d RPM\n", fan_speeds[sysfan_speed].fan_speed); hwm_write(0x05, fan_speeds[sysfan_speed].fan_in); // SYSFANIN target speed break; case FAN_CRUISE_CONTROL_THERMAL: - printk_debug("Fan Cruise Control setting system fan to activation at %d deg C/%d deg F\n", + printk(BIOS_DEBUG, "Fan Cruise Control setting system fan to activation at %d deg C/%d deg F\n", temperatures[sysfan_temperature].deg_celsius, temperatures[sysfan_temperature].deg_fahrenheit); hwm_write(0x05, temperatures[sysfan_temperature].deg_celsius); // SYSFANIN target temperature diff --git a/src/mainboard/kontron/986lcd-m/mainboard_smi.c b/src/mainboard/kontron/986lcd-m/mainboard_smi.c index 192648f5ca..6e4b5ad8d1 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard_smi.c +++ b/src/mainboard/kontron/986lcd-m/mainboard_smi.c @@ -32,7 +32,7 @@ int mainboard_io_trap_handler(int smif) { switch (smif) { case 0x99: - printk_debug("Sample\n"); + printk(BIOS_DEBUG, "Sample\n"); gnvs->smif = 0; break; default: diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c index fce7835952..dbf36bd51c 100644 --- a/src/mainboard/kontron/986lcd-m/mptable.c +++ b/src/mainboard/kontron/986lcd-m/mptable.c @@ -59,7 +59,7 @@ static void *smp_write_config_table(void *v) firewire = dev_find_device(0x104c, 0x8023, 0); if (firewire) { firewire_bus = firewire->bus->secondary; - printk_spew("Firewire device is on bus %x\n", + printk(BIOS_SPEW, "Firewire device is on bus %x\n", firewire_bus); max_pci_bus = firewire_bus; } @@ -71,7 +71,7 @@ static void *smp_write_config_table(void *v) riser = dev_find_device(0x3388, 0x0022, 0); if (riser) { riser_bus = riser->link[0].secondary; - printk_spew("Riser bus is %x\n", riser_bus); + printk(BIOS_SPEW, "Riser bus is %x\n", riser_bus); max_pci_bus = riser_bus; } @@ -153,7 +153,7 @@ static void *smp_write_config_table(void *v) mc->mpe_checksum = smp_compute_checksum(smp_next_mpc_entry(mc), mc->mpe_length); mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length); - printk_debug("Wrote the mp table end at: %p - %p\n", mc, smp_next_mpe_entry(mc)); + printk(BIOS_DEBUG, "Wrote the mp table end at: %p - %p\n", mc, smp_next_mpe_entry(mc)); return smp_next_mpe_entry(mc); } diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c index 32cd1c7ff9..9142a55707 100644 --- a/src/mainboard/kontron/986lcd-m/romstage.c +++ b/src/mainboard/kontron/986lcd-m/romstage.c @@ -68,7 +68,7 @@ #include "southbridge/intel/i82801gx/i82801gx.h" static void setup_ich7_gpios(void) { - printk_debug(" GPIOS..."); + printk(BIOS_DEBUG, " GPIOS..."); /* General Registers */ outl(0x1f1ff7c0, DEFAULT_GPIOBASE + 0x00); /* GPIO_USE_SEL */ outl(0xe0e8efc3, DEFAULT_GPIOBASE + 0x04); /* GP_IO_SEL */ @@ -265,18 +265,18 @@ static void rcba_config(void) reg32 |= FD_PCIE6|FD_PCIE5|FD_PCIE4; if (read_option(CMOS_VSTART_ethernet1, CMOS_VLEN_ethernet1, 0) != 0) { - printk_debug("Disabling ethernet adapter 1.\n"); + printk(BIOS_DEBUG, "Disabling ethernet adapter 1.\n"); reg32 |= FD_PCIE1; } if (read_option(CMOS_VSTART_ethernet2, CMOS_VLEN_ethernet2, 0) != 0) { - printk_debug("Disabling ethernet adapter 2.\n"); + printk(BIOS_DEBUG, "Disabling ethernet adapter 2.\n"); reg32 |= FD_PCIE2; } else { if (reg32 & FD_PCIE1) port_shuffle = 1; } if (read_option(CMOS_VSTART_ethernet3, CMOS_VLEN_ethernet3, 0) != 0) { - printk_debug("Disabling ethernet adapter 3.\n"); + printk(BIOS_DEBUG, "Disabling ethernet adapter 3.\n"); reg32 |= FD_PCIE3; } else { if (reg32 & FD_PCIE1) @@ -392,7 +392,7 @@ void real_main(unsigned long bist) report_bist_failure(bist); if (MCHBAR16(SSKPD) == 0xCAFE) { - printk_debug("soft reset detected.\n"); + printk(BIOS_DEBUG, "soft reset detected.\n"); boot_mode = 1; } @@ -403,10 +403,10 @@ void real_main(unsigned long bist) /* Read PM1_CNT */ reg32 = inl(DEFAULT_PMBASE + 0x04); - printk_debug("PM1_CNT: %08x\n", reg32); + printk(BIOS_DEBUG, "PM1_CNT: %08x\n", reg32); if (((reg32 >> 10) & 7) == 5) { #if CONFIG_HAVE_ACPI_RESUME - printk_debug("Resume from S3 detected.\n"); + printk(BIOS_DEBUG, "Resume from S3 detected.\n"); boot_mode = 2; /* Clear SLP_TYPE. This will break stage2 but * we care for that when we get there. @@ -414,7 +414,7 @@ void real_main(unsigned long bist) outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04); #else - printk_debug("Resume from S3 detected, but disabled.\n"); + printk(BIOS_DEBUG, "Resume from S3 detected, but disabled.\n"); #endif } @@ -451,7 +451,7 @@ void real_main(unsigned long bist) /* This will not work if TSEG is in place! */ u32 tom = pci_read_config32(PCI_DEV(0,2,0), 0x5c); - printk_debug("TOM: 0x%08x\n", tom); + printk(BIOS_DEBUG, "TOM: 0x%08x\n", tom); ram_check(0x00000000, 0x000a0000); //ram_check(0x00100000, tom); } diff --git a/src/mainboard/kontron/986lcd-m/rtl8168.c b/src/mainboard/kontron/986lcd-m/rtl8168.c index 18f41fe32a..e278bcfb4e 100644 --- a/src/mainboard/kontron/986lcd-m/rtl8168.c +++ b/src/mainboard/kontron/986lcd-m/rtl8168.c @@ -27,7 +27,7 @@ static void nic_init(struct device *dev) { - printk_debug("Initializing RTL8168 Gigabit Ethernet\n"); + printk(BIOS_DEBUG, "Initializing RTL8168 Gigabit Ethernet\n"); // Nothing to do yet, but this has to be here to keep // coreboot from trying to execute an option ROM. } diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c index f450b7c4bf..b77a3bd507 100644 --- a/src/mainboard/kontron/kt690/acpi_tables.c +++ b/src/mainboard/kontron/kt690/acpi_tables.c @@ -49,9 +49,9 @@ static void dump_mem(u32 start, u32 end) print_debug("dump_mem:"); for (i = start; i < end; i++) { if ((i & 0xf) == 0) { - printk_debug("\n%08x:", i); + printk(BIOS_DEBUG, "\n%08x:", i); } - printk_debug(" %02x", (u8)*((u8 *)i)); + printk(BIOS_DEBUG, " %02x", (u8)*((u8 *)i)); } print_debug("\n"); } @@ -147,7 +147,7 @@ unsigned long write_acpi_tables(unsigned long start) start = (start + 0x0f) & -0x10; current = start; - printk_info("ACPI: Writing ACPI tables at %lx...\n", start); + printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start); /* We need at least an RSDP and an RSDT Table */ rsdp = (acpi_rsdp_t *) current; @@ -165,13 +165,13 @@ unsigned long write_acpi_tables(unsigned long start) * We explicitly add these tables later on: */ /* If we want to use HPET Timers Linux wants an MADT */ - printk_debug("ACPI: * HPET\n"); + printk(BIOS_DEBUG, "ACPI: * HPET\n"); hpet = (acpi_hpet_t *) current; current += sizeof(acpi_hpet_t); acpi_create_hpet(hpet); acpi_add_table(rsdp, hpet); - printk_debug("ACPI: * MADT\n"); + printk(BIOS_DEBUG, "ACPI: * MADT\n"); madt = (acpi_madt_t *) current; acpi_create_madt(madt); current += madt->header.length; @@ -179,14 +179,14 @@ unsigned long write_acpi_tables(unsigned long start) #if 0 /* SRAT */ - printk_debug("ACPI: * SRAT\n"); + printk(BIOS_DEBUG, "ACPI: * SRAT\n"); srat = (acpi_srat_t *) current; acpi_create_srat(srat); current += srat->header.length; acpi_add_table(rsdp, srat); /* SLIT */ - printk_debug("ACPI: * SLIT\n"); + printk(BIOS_DEBUG, "ACPI: * SLIT\n"); slit = (acpi_slit_t *) current; acpi_create_slit(slit); current += slit->header.length; @@ -194,7 +194,7 @@ unsigned long write_acpi_tables(unsigned long start) #endif /* SSDT */ - printk_debug("ACPI: * SSDT\n"); + printk(BIOS_DEBUG, "ACPI: * SSDT\n"); ssdt = (acpi_header_t *)current; acpi_create_ssdt_generator(ssdt, "DYNADATA"); @@ -214,7 +214,7 @@ unsigned long write_acpi_tables(unsigned long start) } else { c = (uint8_t) ('A' + i - 1 - 6); } - printk_debug("ACPI: * SSDT for PCI%c Aka hcid = %d\n", c, sysconf.hcid[i]); /* pci0 and pci1 are in dsdt */ + printk(BIOS_DEBUG, "ACPI: * SSDT for PCI%c Aka hcid = %d\n", c, sysconf.hcid[i]); /* pci0 and pci1 are in dsdt */ current = (current + 0x07) & -0x08; ssdtx = (acpi_header_t *) current; switch (sysconf.hcid[i]) { @@ -243,20 +243,20 @@ unsigned long write_acpi_tables(unsigned long start) #endif /* FACS */ - printk_debug("ACPI: * FACS\n"); + printk(BIOS_DEBUG, "ACPI: * FACS\n"); facs = (acpi_facs_t *) current; current += sizeof(acpi_facs_t); acpi_create_facs(facs); /* DSDT */ - printk_debug("ACPI: * DSDT\n"); + printk(BIOS_DEBUG, "ACPI: * DSDT\n"); dsdt = (acpi_header_t *) current; memcpy((void *)dsdt, (void *)AmlCode, ((acpi_header_t *) AmlCode)->length); current += dsdt->length; - printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); + printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FADT */ - printk_debug("ACPI: * FADT\n"); + printk(BIOS_DEBUG, "ACPI: * FADT\n"); fadt = (acpi_fadt_t *) current; current += sizeof(acpi_fadt_t); @@ -264,28 +264,28 @@ unsigned long write_acpi_tables(unsigned long start) acpi_add_table(rsdp, fadt); #if DUMP_ACPI_TABLES == 1 - printk_debug("rsdp\n"); + printk(BIOS_DEBUG, "rsdp\n"); dump_mem(rsdp, ((void *)rsdp) + sizeof(acpi_rsdp_t)); - printk_debug("rsdt\n"); + printk(BIOS_DEBUG, "rsdt\n"); dump_mem(rsdt, ((void *)rsdt) + sizeof(acpi_rsdt_t)); - printk_debug("madt\n"); + printk(BIOS_DEBUG, "madt\n"); dump_mem(madt, ((void *)madt) + madt->header.length); - printk_debug("srat\n"); + printk(BIOS_DEBUG, "srat\n"); dump_mem(srat, ((void *)srat) + srat->header.length); - printk_debug("slit\n"); + printk(BIOS_DEBUG, "slit\n"); dump_mem(slit, ((void *)slit) + slit->header.length); - printk_debug("ssdt\n"); + printk(BIOS_DEBUG, "ssdt\n"); dump_mem(ssdt, ((void *)ssdt) + ssdt->length); - printk_debug("fadt\n"); + printk(BIOS_DEBUG, "fadt\n"); dump_mem(fadt, ((void *)fadt) + fadt->header.length); #endif - printk_info("ACPI: done.\n"); + printk(BIOS_INFO, "ACPI: done.\n"); return current; } diff --git a/src/mainboard/kontron/kt690/fadt.c b/src/mainboard/kontron/kt690/fadt.c index e7bc017bbd..5d28790b4d 100644 --- a/src/mainboard/kontron/kt690/fadt.c +++ b/src/mainboard/kontron/kt690/fadt.c @@ -46,7 +46,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) acpi_header_t *header = &(fadt->header); pm_base &= 0xFFFF; - printk_debug("pm_base: 0x%04x\n", pm_base); + printk(BIOS_DEBUG, "pm_base: 0x%04x\n", pm_base); /* Prepare the header */ memset((void *)fadt, 0, sizeof(acpi_fadt_t)); diff --git a/src/mainboard/kontron/kt690/irq_tables.c b/src/mainboard/kontron/kt690/irq_tables.c index 38479aac14..8457745724 100644 --- a/src/mainboard/kontron/kt690/irq_tables.c +++ b/src/mainboard/kontron/kt690/irq_tables.c @@ -73,7 +73,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) addr &= ~15; /* This table must be betweeen 0xf0000 & 0x100000 */ - printk_info("Writing IRQ routing tables to 0x%lx...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr); pirq = (void *)(addr); v = (u8 *) (addr); @@ -113,7 +113,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) pirq->checksum = sum; } - printk_info("write_pirq_routing_table done.\n"); + printk(BIOS_INFO, "write_pirq_routing_table done.\n"); return (unsigned long)pirq_info; } diff --git a/src/mainboard/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c index da5cd0402e..5de74a6cff 100644 --- a/src/mainboard/kontron/kt690/mainboard.c +++ b/src/mainboard/kontron/kt690/mainboard.c @@ -61,7 +61,7 @@ static void enable_onboard_nic() { u8 byte; - printk_info("%s.\n", __func__); + printk(BIOS_INFO, "%s.\n", __func__); /* set index register 0C50h to 13h (miscellaneous control) */ outb(0x13, 0xC50); /* CMIndex */ @@ -100,7 +100,7 @@ static void get_ide_dma66() struct device *sm_dev; struct device *ide_dev; - printk_info("%s.\n", __func__); + printk(BIOS_INFO, "%s.\n", __func__); sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); byte = pci_read_config8(sm_dev, 0xA9); @@ -137,7 +137,7 @@ static void set_thermal_config() byte = ADT7461_read_byte(0x02); /* read status register to clear it */ ARA_read_byte(0x05); /* A hardware alert can only be cleared by the master sending an ARA as a read command */ - printk_info("Init adt7461 end , status 0x02 %02x\n", byte); + printk(BIOS_INFO, "Init adt7461 end , status 0x02 %02x\n", byte); /* sb600 settings for thermal config */ /* set SB600 GPIO 64 to GPIO with pull-up */ @@ -190,19 +190,19 @@ void kt690_enable(device_t dev) struct mainboard_config *mainboard = (struct mainboard_config *)dev->chip_info; - printk_info("Mainboard KT690 Enable. dev=0x%p\n", dev); + printk(BIOS_INFO, "Mainboard KT690 Enable. dev=0x%p\n", dev); #if (CONFIG_GFXUMA == 1) msr_t msr, msr2; /* TOP_MEM: the top of DRAM below 4G */ msr = rdmsr(TOP_MEM); - printk_info("%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n", + printk(BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n", __func__, msr.lo, msr.hi); /* TOP_MEM2: the top of DRAM above 4G */ msr2 = rdmsr(TOP_MEM2); - printk_info("%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n", + printk(BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n", __func__, msr2.lo, msr2.hi); switch (msr.lo) { @@ -224,7 +224,7 @@ void kt690_enable(device_t dev) } uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */ - printk_info("%s: uma size 0x%08llx, memory start 0x%08llx\n", + printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n", __func__, uma_memory_size, uma_memory_base); /* TODO: TOP_MEM2 */ @@ -244,7 +244,7 @@ int add_mainboard_resources(struct lb_memory *mem) * in some circumstances we want the memory mentioned as reserved. */ #if (CONFIG_GFXUMA == 1) - printk_info("uma_memory_base=0x%llx, uma_memory_size=0x%llx \n", + printk(BIOS_INFO, "uma_memory_base=0x%llx, uma_memory_size=0x%llx \n", uma_memory_base, uma_memory_size); lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, uma_memory_size); diff --git a/src/mainboard/kontron/kt690/mptable.c b/src/mainboard/kontron/kt690/mptable.c index 06926bdad4..ec1695e6ae 100644 --- a/src/mainboard/kontron/kt690/mptable.c +++ b/src/mainboard/kontron/kt690/mptable.c @@ -199,7 +199,7 @@ void *smp_write_config_table(void *v) mc->mpe_checksum = smp_compute_checksum(smp_next_mpc_entry(mc), mc->mpe_length); mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length); - printk_debug("Wrote the mp table end at: %p - %p\n", + printk(BIOS_DEBUG, "Wrote the mp table end at: %p - %p\n", mc, smp_next_mpe_entry(mc)); return smp_next_mpe_entry(mc); } diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c index eb01747828..8ea8e6eae1 100644 --- a/src/mainboard/kontron/kt690/romstage.c +++ b/src/mainboard/kontron/kt690/romstage.c @@ -136,7 +136,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) /* Halt if there was a built in self test failure */ report_bist_failure(bist); - printk_debug("bsp_apicid=0x%x\n", bsp_apicid); + printk(BIOS_DEBUG, "bsp_apicid=0x%x\n", bsp_apicid); setup_kt690_resource_map(); @@ -162,7 +162,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) /* Read FIDVID_STATUS */ msr=rdmsr(0xc0010042); - printk_debug("begin msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo); + printk(BIOS_DEBUG, "begin msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo); enable_fid_change(); enable_fid_change_on_sb(sysinfo->sbbusn, sysinfo->sbdn); @@ -170,17 +170,17 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) /* show final fid and vid */ msr=rdmsr(0xc0010042); - printk_debug("end msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo); + printk(BIOS_DEBUG, "end msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo); } else { - printk_debug("Changing FIDVID not supported\n"); - printk_spew("... because cpuid returned %08x\n", cpuid1.edx); + printk(BIOS_DEBUG, "Changing FIDVID not supported\n"); + printk(BIOS_SPEW, "... because cpuid returned %08x\n", cpuid1.edx); } needs_reset = optimize_link_coherent_ht(); needs_reset |= optimize_link_incoherent_ht(sysinfo); rs690_htinit(); - printk_debug("needs_reset=0x%x\n", needs_reset); + printk(BIOS_DEBUG, "needs_reset=0x%x\n", needs_reset); if (needs_reset) { @@ -191,7 +191,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) allow_all_aps_stop(bsp_apicid); /* It's the time to set ctrl now; */ - printk_debug("sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", + printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", sysinfo->nodes, sysinfo->ctrl, spd_addr); fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr); sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo); |