Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Side by Side Diff: flashrom.c

Issue 6025013: Add flashmap (fmap) support to Flashrom (Closed) Base URL: svn://coreboot.org/flashrom/trunk
Patch Set: remove a superfluous debug message Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « flash.h ('k') | fmap.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of the flashrom project. 2 * This file is part of the flashrom project.
3 * 3 *
4 * Copyright (C) 2000 Silicon Integrated System Corporation 4 * Copyright (C) 2000 Silicon Integrated System Corporation
5 * Copyright (C) 2004 Tyan Corp <yhlu@tyan.com> 5 * Copyright (C) 2004 Tyan Corp <yhlu@tyan.com>
6 * Copyright (C) 2005-2008 coresystems GmbH 6 * Copyright (C) 2005-2008 coresystems GmbH
7 * Copyright (C) 2008,2009 Carl-Daniel Hailfinger 7 * Copyright (C) 2008,2009 Carl-Daniel Hailfinger
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
(...skipping 1879 matching lines...) Expand 10 before | Expand all | Expand 10 after
1890 ret = 1; 1890 ret = 1;
1891 goto out_nofree; 1891 goto out_nofree;
1892 } 1892 }
1893 1893
1894 /* Given the existence of read locks, we want to unlock for read, 1894 /* Given the existence of read locks, we want to unlock for read,
1895 * erase and write. 1895 * erase and write.
1896 */ 1896 */
1897 if (flash->unlock) 1897 if (flash->unlock)
1898 flash->unlock(flash); 1898 flash->unlock(flash);
1899 1899
1900 /* add entries for regions specified in flashmap */
1901 if (add_fmap_entries(flash) < 0) {
1902 ret = 1;
1903 goto out_nofree;
1904 }
1905
1900 /* mark entries included using -i argument as "included" if they are 1906 /* mark entries included using -i argument as "included" if they are
1901 found in the master rom_entries list */ 1907 found in the master rom_entries list */
1902 if (process_include_args() < 0) { 1908 if (process_include_args() < 0) {
1903 ret = 1; 1909 ret = 1;
1904 goto out_nofree; 1910 goto out_nofree;
1905 } 1911 }
1906 1912
1907 if (read_it) { 1913 if (read_it) {
1908 ret = read_flash_to_file(flash, filename); 1914 ret = read_flash_to_file(flash, filename);
1909 goto out_nofree; 1915 goto out_nofree;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
2002 out_nofree: 2008 out_nofree:
2003 chip_restore(); /* must be done before programmer_shutdown() */ 2009 chip_restore(); /* must be done before programmer_shutdown() */
2004 /* 2010 /*
2005 * programmer_shutdown() call is moved to cli_mfg() in chromium os 2011 * programmer_shutdown() call is moved to cli_mfg() in chromium os
2006 * tree. This is because some operations, such as write protection, 2012 * tree. This is because some operations, such as write protection,
2007 * requires programmer_shutdown() but does not call doit(). 2013 * requires programmer_shutdown() but does not call doit().
2008 */ 2014 */
2009 // programmer_shutdown(); 2015 // programmer_shutdown();
2010 return ret; 2016 return ret;
2011 } 2017 }
OLDNEW
« no previous file with comments | « flash.h ('k') | fmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698