aboutsummaryrefslogtreecommitdiff
path: root/libflash
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2016-07-05 21:36:36 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-08-25 19:07:08 +1000
commit0ae753a084b555e3356c37c79ca743aedd11df02 (patch)
treead190ba227be9537c2bdaf50c2cf7124f75d55c7 /libflash
parent026b9a13bf8d61a7e72721d59961b40cbc98b410 (diff)
downloadskiboot-0ae753a084b555e3356c37c79ca743aedd11df02.zip
skiboot-0ae753a084b555e3356c37c79ca743aedd11df02.tar.gz
skiboot-0ae753a084b555e3356c37c79ca743aedd11df02.tar.bz2
flash: Rework error paths and messages for multiple flash controllers
The current flash code was written with only one flash chip, which is a system_flash (ie. the PNOR image), in mind. Now that we have mambo bogusdisk flash, we can have many flash chips. This is resulting in some confusing output messages. This reworks some of the error paths and warnings to make this more coherent when we have multiple flash chips. We assume everything can be a system flash, so I've removed the is_system_flash parameter from flash_register(). We'll use the first system flash we find and warn if we find another since discovery order is not a guaranteed API. Signed-off-by: Michael Neuling <mikey@neuling.org> Acked-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'libflash')
-rw-r--r--libflash/libffs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libflash/libffs.c b/libflash/libffs.c
index 65c3fbe..8b1c2a7 100644
--- a/libflash/libffs.c
+++ b/libflash/libffs.c
@@ -135,7 +135,7 @@ int ffs_init(uint32_t offset, uint32_t max_size, struct blocklevel_device *bl,
/* Convert and check flash header */
rc = ffs_check_convert_header(&f->hdr, &hdr);
if (rc) {
- FL_ERR("FFS: Error %d checking flash header\n", rc);
+ FL_INF("FFS: Flash header not found. Code: %d\n", rc);
goto out;
}