openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Introduce ERROR_FATAL, abort upon failed chipset enables

Browse Source 
Corresponding to flashrom svn r1426.

Signed-off-by: Tadas Slotkus <devtadas@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Tadas Slotkus 2011-09-03 17:15:00 +00:00 committed by Uwe Hermann
parent 3093f8f75e
commit ad470347fd
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chipset_enable.c
View File

@ -1325,6 +1325,10 @@ int chipset_flash_enable(void)
msg_pinfo("OK.\n"); msg_pinfo("OK.\n");
else if (ret == ERROR_NONFATAL) else if (ret == ERROR_NONFATAL)
msg_pinfo("PROBLEMS, continuing anyway\n"); msg_pinfo("PROBLEMS, continuing anyway\n");
if (ret == ERROR_FATAL) {
msg_perr("FATAL ERROR!\n");
return ret;
}
} }
s = flashbuses_to_text(buses_supported); s = flashbuses_to_text(buses_supported);

5
flash.h
View File

@ -224,9 +224,12 @@ int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filena
#define OK 0 #define OK 0
#define NT 1 /* Not tested */ #define NT 1 /* Not tested */
/* Something happened that shouldn't happen, but we can go on */ /* Something happened that shouldn't happen, but we can go on. */
#define ERROR_NONFATAL 0x100 #define ERROR_NONFATAL 0x100
/* Something happened that shouldn't happen, we'll abort. */
#define ERROR_FATAL -0xee
/* cli_output.c */ /* cli_output.c */
/* Let gcc and clang check for correct printf-style format strings. */ /* Let gcc and clang check for correct printf-style format strings. */
int print(int type, const char *fmt, ...) __attribute__((format(printf, 2, 3))); int print(int type, const char *fmt, ...) __attribute__((format(printf, 2, 3)));

3
internal.c
View File

@ -268,7 +268,8 @@ int internal_init(void)
if (ret == -2) { if (ret == -2) {
msg_perr("WARNING: No chipset found. Flash detection " msg_perr("WARNING: No chipset found. Flash detection "
"will most likely fail.\n"); "will most likely fail.\n");
} } else if (ret == ERROR_FATAL)
return ret;
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
/* Probe unconditionally for IT87* LPC->SPI translation and for /* Probe unconditionally for IT87* LPC->SPI translation and for