path: root/programmer.h
diff options
authorCarl-Daniel Hailfinger <>2011-09-08 00:00:29 +0000
committerCarl-Daniel Hailfinger <>2011-09-08 00:00:29 +0000
commit2e681601b10c26e0293f285dfcb17d006349e450 (patch)
treec4bbc8a1958eeae3521810d75d2b90f4bd85625c /programmer.h
parentcb24ddbe128eb2ad7ef6e0ef11c4cec461dbbe44 (diff)
Change programmer selection in cli and generic code
Bugfix: Do not accept multiple conflicting --programmer selections. Restriction: Do not accept multiple --programmer selections even if there is no conflict. Unexport the programmer variable. programmer_init requires the programmer as first parameter. The default programmer selection is now part of cli_classic. Corresponding to flashrom svn r1433. Signed-off-by: Carl-Daniel Hailfinger <> Acked-by: Stefan Tauner <>
Diffstat (limited to 'programmer.h')
1 files changed, 1 insertions, 3 deletions
diff --git a/programmer.h b/programmer.h
index f878a53..1283909 100644
--- a/programmer.h
+++ b/programmer.h
@@ -85,8 +85,6 @@ enum programmer {
PROGRAMMER_INVALID /* This must always be the last entry. */
-extern enum programmer programmer;
struct programmer_entry {
const char *vendor;
const char *name;
@@ -110,7 +108,7 @@ struct programmer_entry {
extern const struct programmer_entry programmer_table[];
-int programmer_init(char *param);
+int programmer_init(enum programmer prog, char *param);
int programmer_shutdown(void);
enum bitbang_spi_master_type {
OpenPOWER on IntegriCloud