diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-01-10 13:54:53 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-01-13 17:54:08 +0000 |
| commit | 5e76b271b0dbfb64dc70db70465ed4076eaaaaee (patch) | |
| tree | a0b27e6a5c0ebee278c96f6053472f955317b04e | |
| parent | 2811aaa3c809a62bcf16d0970dfda2281a10fcf9 (diff) | |
| download | chrome-ec-5e76b271b0dbfb64dc70db70465ed4076eaaaaee.tar.gz | |
Fix test config being applied outside of test builds
Settings in test_config.h should only be applied #ifdef TEST_BUILD.
This fixes omitting vboot hash all time. It should only be omitted
for test builds.
BUG=None
Original-BUG=chrome-os-partner:24892
BRANCH=all
TEST=boot system; 'hash' command works on EC and system is not stuck in
recovery mode.
Change-Id: Ifd29a803ffdbc77b8eb141ea169c305746d19a63
Original-Change-Id: I15f645824382e25caef9c1c045bb079f374fbb88
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/182167
Reviewed-on: https://chromium-review.googlesource.com/182280
Commit-Queue: Dave Parker <dparker@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>
| -rw-r--r-- | test/test_config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/test_config.h b/test/test_config.h index 4767d034be..d88e71ced9 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -8,6 +8,9 @@ #ifndef __CROS_EC_TEST_CONFIG_H #define __CROS_EC_TEST_CONFIG_H +/* Test config flags only apply for test builds */ +#ifdef TEST_BUILD + /* Don't compile vboot hash support unless specifically testing for it */ #undef CONFIG_VBOOT_HASH @@ -79,4 +82,5 @@ int board_discharge_on_ac(int enabled); #define I2C_PORT_MASTER 1 #endif +#endif /* TEST_BUILD */ #endif /* __CROS_EC_TEST_CONFIG_H */ |