diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2013-05-28 11:18:36 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-06-03 14:32:06 -0700 |
| commit | f8e12df9dfb8d028cee1e9a039c4cbcebc608385 (patch) | |
| tree | 8e7fa19e839cd296dfeca61bc09aaec82ed1f39d | |
| parent | 6759fdc3e6dd7e8901fcf8e25490e4e20273cbcb (diff) | |
| download | chrome-ec-f8e12df9dfb8d028cee1e9a039c4cbcebc608385.tar.gz | |
slippy/falco: Add back in flash and hiberantion setup code
These were tested to make sure they are not responsible for
bricking boards.
The flash code is necessary for software sync, and it is
essential to be able to update boards without servo.
The hibernate setup code was breaking jumping between images
and the passing of data between the images -- needed for
SW SYNC but also needed for things like "reboot ap-off".
BUG=chrome-os-partner:19366
BRANCH=none
TEST=manual: emerge-slippy chromeos-ec, flash+boot, update again via SW Sync
Change-Id: Ib1363b353f18b21e0cad3209783e1e0b4ff24e86
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/56820
| -rw-r--r-- | chip/lm4/flash.c | 7 | ||||
| -rw-r--r-- | chip/lm4/system.c | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/chip/lm4/flash.c b/chip/lm4/flash.c index e7b4064665..c7781c88f1 100644 --- a/chip/lm4/flash.c +++ b/chip/lm4/flash.c @@ -51,10 +51,6 @@ static int write_buffer(void) { int t; -#ifndef BOARD_link /* FIXME: crosbug.com/p/19366 */ - return EC_ERROR_UNKNOWN; -#endif - if (all_protected) return EC_ERROR_ACCESS_DENIED; @@ -127,9 +123,6 @@ int flash_physical_write(int offset, int size, const char *data) int flash_physical_erase(int offset, int size) { -#ifndef BOARD_link /* FIXME: crosbug.com/p/19366 */ - return EC_ERROR_UNKNOWN; -#endif if (all_protected) return EC_ERROR_ACCESS_DENIED; diff --git a/chip/lm4/system.c b/chip/lm4/system.c index 5a13725305..3f0e990e16 100644 --- a/chip/lm4/system.c +++ b/chip/lm4/system.c @@ -295,7 +295,6 @@ void system_hibernate(uint32_t seconds, uint32_t microseconds) void system_pre_init(void) { -#ifdef BOARD_link /* FIXME: crosbug.com/p/19366 */ volatile uint32_t scratch __attribute__((unused)); /* Enable clocks to the hibernation module */ @@ -339,7 +338,6 @@ void system_pre_init(void) LM4_HIBERNATE_HIBRTCT = 0x7fff; wait_for_hibctl_wc(); LM4_HIBERNATE_HIBIM = 0; -#endif check_reset_cause(); |