Skip to content

Commit e962bdd

Browse files
LeilaCY-LinJohnAZoidberg
authored andcommitted
fwk: Use the config to distinguish the item in EC_CMD_READ_BOARDID
Use the config to distinguish the item in host command EC_CMD_READ_BOARDID. The enum name cannot correctly enable the definition. BRANCH=fwk-main BUG=Host command EC_CMD_READ_BOARDID get the error return. TEST=Host command EC_CMD_READ_BOARDID can get mainboard/touchpad/audio board id on sakura. TEST=Host command EC_CMD_READ_BOARDID can get mainboard/dgpu0/dgpu1 board id on tulip. Signed-off-by: LeilaCY-Lin <LeilaCY_Lin@compal.com> (cherry picked from commit 41db6e99a82ac7841a0c59d2db47abb612ac5002)
1 parent 993b916 commit e962bdd

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

zephyr/program/framework/include/board_host_command.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,9 +590,9 @@ enum ec_board_id_type {
590590
HC_BOARD_ID_MAINBOARD = 0,
591591
/* Power button board - Framework 12 */
592592
HC_BOARD_ID_POWERBUTTON_BOARD = 1,
593-
/* Power button board - Framework 12, 13, 16 */
593+
/* Touchpad board - Framework 12, 13 */
594594
HC_BOARD_ID_TOUCHPAD = 2,
595-
/* Power button board - Framework 12, 13 */
595+
/* Audio board - Framework 12, 13 */
596596
HC_BOARD_ID_AUDIO_BOARD = 3,
597597
/* dGPU board - Framework 16 */
598598
HC_BOARD_ID_DGPU0 = 4,

zephyr/program/framework/src/adc.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,19 @@ static enum ec_status hc_read_boardid(struct host_cmd_handler_args *args)
108108
case HC_BOARD_ID_MAINBOARD:
109109
r->board_id = get_hardware_id(ADC_MAIN_BOARD_ID);
110110
break;
111-
#ifdef ADC_POWER_BUTTON_BOARD_ID
111+
#if defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_12)
112112
case HC_BOARD_ID_POWERBUTTON_BOARD:
113113
r->board_id = get_hardware_id(ADC_POWER_BUTTON_BOARD_ID);
114114
break;
115115
#endif
116-
#ifdef ADC_TOUCHPAD_ID
116+
#if defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_12) || \
117+
defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_13)
117118
case HC_BOARD_ID_TOUCHPAD:
118119
r->board_id = get_hardware_id(ADC_TOUCHPAD_ID);
119120
break;
120121
#endif
121-
#ifdef ADC_AUDIO_ID
122+
#if defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_12) || \
123+
defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_13)
122124
case HC_BOARD_ID_AUDIO_BOARD:
123125
r->board_id = get_hardware_id(ADC_AUDIO_ID);
124126
break;

0 commit comments

Comments
 (0)