From e969b392125b549e33f8e3b979961d534a1c5d27 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Fri, 10 Jan 2014 13:54:53 -0800 Subject: 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=chrome-os-partner:24892 BRANCH=all TEST=boot system; 'hash' command works on EC and system is not stuck in recovery mode. Change-Id: I15f645824382e25caef9c1c045bb079f374fbb88 Signed-off-by: Randall Spangler Reviewed-on: https://chromium-review.googlesource.com/182167 Reviewed-by: Aaron Durbin --- test/test_config.h | 4 ++++ 1 file changed, 4 insertions(+) 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 */ -- cgit v1.2.1