summaryrefslogtreecommitdiff
path: root/chip/lm4/system.c
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2013-05-28 11:18:36 -0700
committerChromeBot <chrome-bot@google.com>2013-06-03 14:32:06 -0700
commitf8e12df9dfb8d028cee1e9a039c4cbcebc608385 (patch)
tree8e7fa19e839cd296dfeca61bc09aaec82ed1f39d /chip/lm4/system.c
parent6759fdc3e6dd7e8901fcf8e25490e4e20273cbcb (diff)
downloadchrome-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
Diffstat (limited to 'chip/lm4/system.c')
-rw-r--r--chip/lm4/system.c2
1 files changed, 0 insertions, 2 deletions
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();