diff options
-rw-r--r-- | common/build.mk | 2 | ||||
-rw-r--r-- | common/ec_features.c | 2 | ||||
-rw-r--r-- | common/host_command.c | 6 | ||||
-rw-r--r-- | common/host_event_commands.c | 32 | ||||
-rw-r--r-- | common/main.c | 2 | ||||
-rw-r--r-- | include/console_channel.inc | 2 | ||||
-rw-r--r-- | include/host_command.h | 2 |
7 files changed, 24 insertions, 24 deletions
diff --git a/common/build.mk b/common/build.mk index 9044d32353..2d572b2d13 100644 --- a/common/build.mk +++ b/common/build.mk @@ -86,7 +86,7 @@ common-$(CONFIG_LED_ONOFF_STATES)+=led_onoff_states.o common-$(CONFIG_LID_ANGLE)+=motion_lid.o math_util.o common-$(CONFIG_LID_ANGLE_UPDATE)+=lid_angle.o common-$(CONFIG_LID_SWITCH)+=lid_switch.o -common-$(CONFIG_HOSTCMD_X86)+=acpi.o port80.o ec_features.o +common-$(CONFIG_LPC)+=acpi.o port80.o ec_features.o common-$(CONFIG_MAG_CALIBRATE)+= mag_cal.o math_util.o vec3.o mat33.o mat44.o common-$(CONFIG_MKBP_EVENT)+=mkbp_event.o common-$(CONFIG_PECI_COMMON)+=peci.o diff --git a/common/ec_features.c b/common/ec_features.c index aca031fbd0..309ba3cb37 100644 --- a/common/ec_features.c +++ b/common/ec_features.c @@ -40,7 +40,7 @@ uint32_t get_feature_flags0(void) #ifdef CONFIG_PSTORE | EC_FEATURE_MASK_0(EC_FEATURE_PSTORE) #endif -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC | EC_FEATURE_MASK_0(EC_FEATURE_PORT80) #endif #ifdef CONFIG_TEMP_SENSOR diff --git a/common/host_command.c b/common/host_command.c index c3a207937e..4fe8705019 100644 --- a/common/host_command.c +++ b/common/host_command.c @@ -36,7 +36,7 @@ static struct host_cmd_handler_args *pending_args; /* Verify Boot Mode */ static int g_vboot_mode; -#ifndef CONFIG_HOSTCMD_X86 +#ifndef CONFIG_LPC /* * Simulated memory map. Must be word-aligned, because some of the elements * in the memory map are words. @@ -91,7 +91,7 @@ static uint32_t hc_suppressed_cnt[ARRAY_SIZE(hc_suppressed_cmd)]; uint8_t *host_get_memmap(int offset) { -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC return lpc_get_memmap_range() + offset; #else return host_memmap + offset; @@ -521,7 +521,7 @@ DECLARE_HOST_COMMAND(EC_CMD_READ_TEST, host_command_read_test, EC_VER_MASK(0)); -#ifndef CONFIG_HOSTCMD_X86 +#ifndef CONFIG_LPC /* * Host command to read memory map is not needed on LPC, because LPC can * directly map the data to the host's memory space. diff --git a/common/host_event_commands.c b/common/host_event_commands.c index 9fe5d339df..2d76bbaa89 100644 --- a/common/host_event_commands.c +++ b/common/host_event_commands.c @@ -46,7 +46,7 @@ static void host_event_set_bit(host_event_t *ev, uint8_t bit) *ptr = HOST_EVENT_32BIT_MASK(bit); } -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC #define LPC_SYSJUMP_TAG 0x4c50 /* "LP" */ #define LPC_SYSJUMP_OLD_VERSION 1 @@ -252,7 +252,7 @@ static host_event_t events; static host_event_t events_copy_b; /* Lazy wake masks */ -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC static struct lazy_wake_masks { host_event_t s3_lazy_wm; host_event_t s5_lazy_wm; @@ -282,7 +282,7 @@ static void host_events_atomic_clear(host_event_t *e, host_event_t m) #endif } -#if !defined(CONFIG_HOSTCMD_X86) && defined(CONFIG_MKBP_EVENT) +#if !defined(CONFIG_LPC) && defined(CONFIG_MKBP_EVENT) static void host_events_send_mkbp_event(host_event_t e) { #ifdef CONFIG_HOST_EVENT64 @@ -312,7 +312,7 @@ void host_set_events(host_event_t mask) mask &= CONFIG_HOST_EVENT_REPORT_MASK; #endif -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC /* * Host only cares about the events for which the masks are set either * in wake mask, SCI mask or SMI mask. In addition to that, there are @@ -333,7 +333,7 @@ void host_set_events(host_event_t mask) host_events_atomic_or(&events, mask); host_events_atomic_or(&events_copy_b, mask); -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC lpc_set_host_event_state(events); #else *(host_event_t *)host_get_memmap(EC_MEMMAP_HOST_EVENTS) = events; @@ -343,7 +343,7 @@ void host_set_events(host_event_t mask) #endif host_events_send_mkbp_event(events); #endif /* CONFIG_MKBP_EVENT */ -#endif /* !CONFIG_HOSTCMD_X86 */ +#endif /* !CONFIG_LPC */ } void host_set_single_event(enum host_event_code event) @@ -379,17 +379,17 @@ void host_clear_events(host_event_t mask) host_events_atomic_clear(&events, mask); -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC lpc_set_host_event_state(events); #else *(host_event_t *)host_get_memmap(EC_MEMMAP_HOST_EVENTS) = events; #ifdef CONFIG_MKBP_EVENT host_events_send_mkbp_event(events); #endif -#endif /* !CONFIG_HOSTCMD_X86 */ +#endif /* !CONFIG_LPC */ } -#ifndef CONFIG_HOSTCMD_X86 +#ifndef CONFIG_LPC static int host_get_next_event(uint8_t *out) { uint32_t event_out = (uint32_t)events; @@ -469,7 +469,7 @@ static int command_host_event(int argc, char **argv) host_clear_events(i); else if (!strcasecmp(argv[1], "clearb")) host_clear_events_b(i); -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC else if (!strcasecmp(argv[1], "smi")) lpc_set_host_event_mask(LPC_HOST_EVENT_SMI, i); else if (!strcasecmp(argv[1], "sci")) @@ -487,7 +487,7 @@ static int command_host_event(int argc, char **argv) /* Print current SMI/SCI status */ HOST_EVENT_CCPRINTF("Events: ", host_get_events()); HOST_EVENT_CCPRINTF("Events-B: ", events_copy_b); -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC HOST_EVENT_CCPRINTF("SMI mask: ", lpc_get_host_event_mask(LPC_HOST_EVENT_SMI)); HOST_EVENT_CCPRINTF("SCI mask: ", @@ -506,7 +506,7 @@ DECLARE_CONSOLE_COMMAND(hostevent, command_host_event, /*****************************************************************************/ /* Host commands */ -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC static enum ec_status host_event_get_smi_mask(struct host_cmd_handler_args *args) @@ -592,7 +592,7 @@ uint8_t lpc_is_active_wm_set_by_host(void) return active_wm_set_by_host; } -#endif /* CONFIG_HOSTCMD_X86 */ +#endif /* CONFIG_LPC */ static enum ec_status host_event_get_b(struct host_cmd_handler_args *args) { @@ -642,7 +642,7 @@ static enum ec_status host_event_action_get(struct host_cmd_handler_args *args) case EC_HOST_EVENT_B: r->value = events_copy_b; break; -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC case EC_HOST_EVENT_SCI_MASK: r->value = lpc_get_host_event_mask(LPC_HOST_EVENT_SCI); break; @@ -683,7 +683,7 @@ static enum ec_status host_event_action_set(struct host_cmd_handler_args *args) host_event_t mask_value __unused = (host_event_t)(p->value); switch (p->mask_type) { -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC case EC_HOST_EVENT_SCI_MASK: lpc_set_host_event_mask(LPC_HOST_EVENT_SCI, mask_value); break; @@ -765,7 +765,7 @@ DECLARE_HOST_COMMAND(EC_CMD_HOST_EVENT, #define LAZY_WAKE_MASK_SYSJUMP_TAG 0x4C4D /* LM - Lazy Mask*/ #define LAZY_WAKE_MASK_HOOK_VERSION 1 -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC int get_lazy_wake_mask(enum power_state state, host_event_t *mask) { int ret = EC_SUCCESS; diff --git a/common/main.c b/common/main.c index 4637662220..6202c5d4d3 100644 --- a/common/main.c +++ b/common/main.c @@ -151,7 +151,7 @@ test_mockable __keep int main(void) * done, lpc always report mask needs to be initialized * correctly. */ -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC lpc_init_mask(); #endif if (IS_ENABLED(CONFIG_I2C_CONTROLLER)) { diff --git a/include/console_channel.inc b/include/console_channel.inc index 34a5e1be48..9e2c37c91e 100644 --- a/include/console_channel.inc +++ b/include/console_channel.inc @@ -60,7 +60,7 @@ CONSOLE_CHANNEL(CC_LIGHTBAR, "lightbar") Use CC_LPC for any host communication channels to x86, like LPC, eSPI, or IPC... */ -#if defined(CONFIG_HOSTCMD_X86) || defined(HAS_TASK_IPC_MNG) || defined(HAS_TASK_HECI_RX) +#if defined(CONFIG_LPC) || defined(HAS_TASK_IPC_MNG) || defined(HAS_TASK_HECI_RX) CONSOLE_CHANNEL(CC_LPC, "lpc") #endif CONSOLE_CHANNEL(CC_MOTION_LID, "motionlid") diff --git a/include/host_command.h b/include/host_command.h index 8ace629505..256a5617ca 100644 --- a/include/host_command.h +++ b/include/host_command.h @@ -190,7 +190,7 @@ host_event_t host_get_events(void); */ int host_is_event_set(enum host_event_code event); -#ifdef CONFIG_HOSTCMD_X86 +#ifdef CONFIG_LPC /* * Get lazy wake masks for the sleep state provided |