aboutsummaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/amd/common/amd_pci_util.c2
-rw-r--r--src/southbridge/intel/bd82x6x/early_me.c4
-rw-r--r--src/southbridge/intel/bd82x6x/early_me_mrc.c6
-rw-r--r--src/southbridge/intel/common/spi.c6
-rw-r--r--src/southbridge/intel/lynxpoint/early_me.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/src/southbridge/amd/common/amd_pci_util.c b/src/southbridge/amd/common/amd_pci_util.c
index fe967d587b..cbba3ef096 100644
--- a/src/southbridge/amd/common/amd_pci_util.c
+++ b/src/southbridge/amd/common/amd_pci_util.c
@@ -89,7 +89,7 @@ void write_pci_cfg_irqs(void)
u32 i = 0;
if (pirq_data_ptr == NULL) {
- printk(BIOS_WARNING, "Warning: Can't write PCI IRQ assignments because"
+ printk(BIOS_WARNING, "Can't write PCI IRQ assignments because"
" 'mainboard_pirq_data' structure does not exist\n");
return;
}
diff --git a/src/southbridge/intel/bd82x6x/early_me.c b/src/southbridge/intel/bd82x6x/early_me.c
index 34e0c99f26..561bed9664 100644
--- a/src/southbridge/intel/bd82x6x/early_me.c
+++ b/src/southbridge/intel/bd82x6x/early_me.c
@@ -56,14 +56,14 @@ int intel_early_me_init(void)
udelay(ME_DELAY);
}
if (!count) {
- printk(BIOS_ERR, "ERROR: ME is not ready!\n");
+ printk(BIOS_ERR, "ME is not ready!\n");
return -1;
}
/* Check for valid firmware */
hfs.raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS);
if (hfs.fpt_bad) {
- printk(BIOS_WARNING, "WARNING: ME has bad firmware\n");
+ printk(BIOS_WARNING, "ME has bad firmware\n");
return -1;
}
diff --git a/src/southbridge/intel/bd82x6x/early_me_mrc.c b/src/southbridge/intel/bd82x6x/early_me_mrc.c
index 2582abb680..88fad7c801 100644
--- a/src/southbridge/intel/bd82x6x/early_me_mrc.c
+++ b/src/southbridge/intel/bd82x6x/early_me_mrc.c
@@ -55,14 +55,14 @@ int intel_early_me_init(void)
udelay(ME_DELAY);
}
if (!count) {
- printk(BIOS_ERR, "ERROR: ME is not ready!\n");
+ printk(BIOS_ERR, "ME is not ready!\n");
return -1;
}
/* Check for valid firmware */
hfs.raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS);
if (hfs.fpt_bad) {
- printk(BIOS_WARNING, "WARNING: ME has bad firmware\n");
+ printk(BIOS_WARNING, "ME has bad firmware\n");
return -1;
}
@@ -114,7 +114,7 @@ int intel_early_me_init_done(u8 status)
udelay(ME_DELAY);
}
if (!count) {
- printk(BIOS_ERR, "ERROR: ME failed to respond\n");
+ printk(BIOS_ERR, "ME failed to respond\n");
return -1;
}
diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c
index 30f7657948..44d283c590 100644
--- a/src/southbridge/intel/common/spi.c
+++ b/src/southbridge/intel/common/spi.c
@@ -998,7 +998,7 @@ static int spi_flash_protect(const struct spi_flash *flash,
}
if (fpr == cntlr.fpr_max) {
- printk(BIOS_ERR, "ERROR: No SPI FPR free!\n");
+ printk(BIOS_ERR, "No SPI FPR free!\n");
return -1;
}
@@ -1017,7 +1017,7 @@ static int spi_flash_protect(const struct spi_flash *flash,
protect_mask |= (ICH9_SPI_FPR_RPE | SPI_FPR_WPE);
break;
default:
- printk(BIOS_ERR, "ERROR: Seeking invalid protection!\n");
+ printk(BIOS_ERR, "Seeking invalid protection!\n");
return -1;
}
@@ -1027,7 +1027,7 @@ static int spi_flash_protect(const struct spi_flash *flash,
/* Set the FPR register and verify it is protected */
write32(&fpr_base[fpr], reg);
if (reg != read32(&fpr_base[fpr])) {
- printk(BIOS_ERR, "ERROR: Unable to set SPI FPR %d\n", fpr);
+ printk(BIOS_ERR, "Unable to set SPI FPR %d\n", fpr);
return -1;
}
diff --git a/src/southbridge/intel/lynxpoint/early_me.c b/src/southbridge/intel/lynxpoint/early_me.c
index 6c73c33ce0..947c570e16 100644
--- a/src/southbridge/intel/lynxpoint/early_me.c
+++ b/src/southbridge/intel/lynxpoint/early_me.c
@@ -45,14 +45,14 @@ int intel_early_me_init(void)
udelay(ME_DELAY);
}
if (!count) {
- printk(BIOS_ERR, "ERROR: ME is not ready!\n");
+ printk(BIOS_ERR, "ME is not ready!\n");
return -1;
}
/* Check for valid firmware */
hfs.raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS);
if (hfs.fpt_bad) {
- printk(BIOS_WARNING, "WARNING: ME has bad firmware\n");
+ printk(BIOS_WARNING, "ME has bad firmware\n");
return -1;
}
@@ -123,7 +123,7 @@ int intel_early_me_init_done(u8 status)
udelay(ME_DELAY);
}
if (!count) {
- printk(BIOS_ERR, "ERROR: ME failed to respond\n");
+ printk(BIOS_ERR, "ME failed to respond\n");
return -1;
}