summaryrefslogtreecommitdiff
path: root/include/flash.h
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-03-16 15:43:34 -0700
committerRandall Spangler <rspangler@chromium.org>2012-03-19 09:04:56 -0700
commit2a9f80d2d990816fe1e5bb1222a6b294673ce7b2 (patch)
treed0c6f16db3b667379b598ae5b733c69a6e2ebe68 /include/flash.h
parenteb3920ec7a6a5e3e28529fd51a6c63cb6e7509e4 (diff)
downloadchrome-ec-2a9f80d2d990816fe1e5bb1222a6b294673ce7b2.tar.gz
More cleanup of board/chip configs and initialization
More modules can be disabled individually through CONFIG_ defines. Reordered early module pre-init and init, and added comments to explain why things are ordered in main() the way they are. Fixed a few assorted init-related bugs along the way, like st32m keyboard scan double-initializing. BUG=none TEST=build link, bds, daisy Signed-off-by: Randall Spangler <rspangler@chromium.org> Change-Id: I04a7fa51d743adfab4be4bdddaeef68943b96dec
Diffstat (limited to 'include/flash.h')
-rw-r--r--include/flash.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/flash.h b/include/flash.h
index 8b965d0147..551068b2a9 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -19,7 +19,7 @@
/* Initializes the module. */
-int flash_init(void);
+int flash_pre_init(void);
/* Returns the usable size of flash in bytes. Note that this is
* smaller than the actual flash size, */