diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-12-06 15:17:33 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-12-16 20:28:32 +0000 |
| commit | 05bd0cdec7a3132fda3127c3c9daeed0ebae0dae (patch) | |
| tree | 37720df1bbd03c8590a33212dfd147eab7b5430e /test | |
| parent | 33ea7aa4739390c2cce578ac8310f0d7b5b3679c (diff) | |
| download | chrome-ec-05bd0cdec7a3132fda3127c3c9daeed0ebae0dae.tar.gz | |
Rename mixed-case config constants
This renames constants used in compiler conditionals to uppercase.
BOARD_foo
CHIP_foo
CHIP_FAMILY_foo
CHIP_VARIANT_foo
CORE_foo
Mixed-case constants are still defined by the makefile, but are now no
longer used. I will make one more pass in a week or so to catch any
that are part of someone else's CL, since otherwise this change might
silently merge correctly but result in incorrect compilation. Then I
will remove defining the mixed-case constants.
BUG=chromium:322144
BRANCH=none
TEST=Build all boards. Also, "git grep 'BOARD_[a-z]'" should return no
results (similarly for CHIP, CORE, etc.)
Change-Id: I6418412e9f7ec604a35c2d426d12475dd83e7076
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/179206
Reviewed-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/stress.c | 12 | ||||
| -rw-r--r-- | test/test_config.h | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/test/stress.c b/test/stress.c index 31e3677c95..36afd5a587 100644 --- a/test/stress.c +++ b/test/stress.c @@ -31,23 +31,23 @@ struct i2c_test_param_t { int offset; int data; /* Non-negative represents data to write. -1 to read. */ } i2c_test_params[] = { -#ifdef BOARD_spring +#ifdef BOARD_SPRING {8, 0, 0x60, 0x0, -1}, {8, 0, 0x60, 0x0, 0x40}, {8, 0, 0x4a, 0x1, -1}, -#elif defined(BOARD_link) +#elif defined(BOARD_LINK) {8, 0, 0x16, 0x8, -1}, {8, 0, 0x16, 0x9, -1}, {8, 0, 0x16, 0xa, -1}, -#elif defined(BOARD_pit) +#elif defined(BOARD_PIT) {8, 0, 0x90, 0x19, -1}, -#elif defined(BOARD_snow) +#elif defined(BOARD_SNOW) {8, 1, 0x90, 0x19, -1}, #endif }; /* Disable I2C test for boards without test configuration */ -#if defined(BOARD_bds) || defined(BOARD_mccroskey) || \ - defined(BOARD_falco) || defined(BOARD_peppy) || defined(BOARD_wolf) +#if defined(BOARD_BDS) || defined(BOARD_MCCROSKEY) || \ + defined(BOARD_FALCO) || defined(BOARD_PEPPY) #undef CONFIG_I2C #endif diff --git a/test/test_config.h b/test/test_config.h index 055a0b60df..70a3ec72a3 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -8,33 +8,33 @@ #ifndef __CROS_EC_TEST_CONFIG_H #define __CROS_EC_TEST_CONFIG_H -#ifdef TEST_adapter +#ifdef TEST_ADAPTER #define CONFIG_CHIPSET_CAN_THROTTLE #define CONFIG_EXTPOWER_FALCO #endif -#ifdef TEST_bklight_lid +#ifdef TEST_BKLIGHT_LID #define CONFIG_BACKLIGHT_LID #endif -#ifdef TEST_bklight_passthru +#ifdef TEST_BKLIGHT_PASSTHRU #define CONFIG_BACKLIGHT_LID #define CONFIG_BACKLIGHT_REQ_GPIO GPIO_PCH_BKLTEN #endif -#ifdef TEST_kb_8042 +#ifdef TEST_KB_8042 #define CONFIG_KEYBOARD_PROTOCOL_8042 #endif -#ifdef TEST_kb_mkbp +#ifdef TEST_KB_MKBP #define CONFIG_KEYBOARD_PROTOCOL_MKBP #endif -#ifdef TEST_kb_scan +#ifdef TEST_KB_SCAN #define CONFIG_KEYBOARD_PROTOCOL_MKBP #endif -#ifdef TEST_led_spring +#ifdef TEST_LED_SPRING #define CONFIG_BATTERY_MOCK #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER_INPUT_CURRENT 4032 @@ -44,7 +44,7 @@ #define I2C_PORT_CHARGER 1 #endif -#ifdef TEST_sbs_charging +#ifdef TEST_SBS_CHARGING #define CONFIG_BATTERY_MOCK #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER @@ -56,13 +56,13 @@ int board_discharge_on_ac(int enabled); #define I2C_PORT_CHARGER 1 #endif -#ifdef TEST_thermal +#ifdef TEST_THERMAL #define CONFIG_CHIPSET_CAN_THROTTLE #define CONFIG_FANS 1 #define CONFIG_TEMP_SENSOR #endif -#ifdef TEST_thermal_falco +#ifdef TEST_THERMAL_FALCO #define CONFIG_BATTERY_MOCK #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER |