From 0d28df409ea6fa112d1ffefef9e8349dd355d4fc Mon Sep 17 00:00:00 2001 From: Shine Liu Date: Thu, 6 Dec 2018 16:25:55 -0800 Subject: chip/ish: replace CONFIG_ISH_xx flags with CHIP_FAMILY and CHIP_VARIANT Replace all CONFIG_ISH_xx flags in chip/ish/* files with CHIP_FAMILY and CHIP_VARIANT. Which provides more structural defines between ISH generations. BRANCH=none BUG=b:120295222 b:112385410 TEST=Test host FW loading for main ISH FW. Change-Id: Ica92eee11034447c9f0828aa986fb1736d20cf27 Signed-off-by: Shine Liu Signed-off-by: li feng Reviewed-on: https://chromium-review.googlesource.com/1367010 Commit-Ready: Caveh Jalali Tested-by: Jett Rink Reviewed-by: Jett Rink --- chip/ish/uart_defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chip/ish/uart_defs.h') diff --git a/chip/ish/uart_defs.h b/chip/ish/uart_defs.h index 9890faeb7c..ba682ccc50 100644 --- a/chip/ish/uart_defs.h +++ b/chip/ish/uart_defs.h @@ -185,9 +185,9 @@ /* KHZ, MHZ */ #define KHZ(x) ((x) * 1000) #define MHZ(x) (KHZ(x) * 1000) -#if (defined CONFIG_ISH_30 || defined CONFIG_ISH_20) +#if defined(CHIP_FAMILY_ISH3) || defined(CHIP_FAMILY_ISH5) #define UART_ISH_INPUT_FREQ MHZ(120) -#elif defined CONFIG_ISH_40 +#elif defined(CHIP_FAMILY_ISH4) #define UART_ISH_INPUT_FREQ MHZ(100) #endif #define UART_DEFAULT_BAUD_RATE 115200 -- cgit v1.2.1